Accepting request 55950 from home:pgajdos

OBS-URL: https://build.opensuse.org/request/show/55950
OBS-URL: https://build.opensuse.org/package/show/graphics/libjpeg-turbo?expand=0&rev=2

libjpeg-turbo.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 14 14:32:56 CET 2010 - pgajdos@suse.cz
+
+- spec file cleanup
+
 -------------------------------------------------------------------
 Fri Dec 10 13:02:58 UTC 2010 - pgajdos@novell.com
 

libjpeg-turbo.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package libjpeg-turbo (Version 1.0.1)
+# spec file for package jpeg-turbo
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,19 +17,26 @@
 
 # norootforbuild
 
+%define major   62
+%define minor   0
+%define micro   0
+%define srcver  1.0.1
+%define libver  %{major}.%{minor}.%{micro}
+# major number of library from jpeg8
+%define cmajor  8
 
 Name:           libjpeg-turbo
-License:        BSD3c(or similar)
+License:        wxWindows Library Licence 3.1
 Group:          Productivity/Graphics/Convertors
 AutoReqProv:    on
-Version:        1.0.1
+Version:        %{srcver}
 Release:        1
 Summary:        A MMX/SSE2 accelerated library for manipulating JPEG image files
 Url:            http://sourceforge.net/projects/libjpeg-turbo
-BuildRequires:  gcc-c++ nasm
+BuildRequires:  nasm gcc-c++
 Provides:       jpeg = %{version}
 Obsoletes:      jpeg
-Conflicts:      jpeg8
+Conflicts:      jpeg%{major}
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf 
 Patch0:         %{name}-%{version}-int32.patch
@@ -42,12 +49,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 The libjpeg-turbo package contains a library of functions for manipulating
 JPEG images.
 
-%package -n libjpeg62
+%package -n libjpeg%{major}
+
 
 License:        BSD3c(or similar)
 Summary:        The MMX/SSE accelerated JPEG compression/decompression library
-Version:        62.0.0
-Release:        1
+Version:        %{libver}
 Provides:       libjpeg6 = %{version}
 Obsoletes:      libjpeg6
 Group:          System/Libraries
@@ -58,7 +65,7 @@ Obsoletes:      libjpeg-64bit
 %endif
 #
 
-%description -n libjpeg62
+%description -n libjpeg%{major}
 This library contains MMX/SSE accelerated functions for manipulating
 JPEG images.
 
@@ -68,16 +75,15 @@ Authors:
     Rob Hooft <hooft@EMBL-Heidelberg.DE>
     Michael Mauldin <mlm@cs.cmu.edu>
 
-%package -n libjpeg62-devel
+%package -n libjpeg%{major}-devel
 License:        BSD3c(or similar)
 Summary:        Development Tools for applications which will use the Libjpeg Library
-Version:        62.0.0
-Release:        1
+Version:        %{libver}
 Group:          Development/Libraries/C and C++
-Requires:       libjpeg62 = %{version}
+Requires:       libjpeg%{major} = %{version}
 Provides:       libjpeg-devel = %{version}
 Obsoletes:      libjpeg-devel
-Conflicts:      libjpeg8-devel
+Conflicts:      libjpeg%{cmajor}-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      libjpeg-devel-64bit
@@ -119,9 +125,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.so
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n libjpeg62 -p /sbin/ldconfig
+%post -n libjpeg%{major} -p /sbin/ldconfig
 
-%postun -n libjpeg62 -p /sbin/ldconfig
+%postun -n libjpeg%{major} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -129,12 +135,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/*
 %doc %{_mandir}/man1/*
 
-%files -n libjpeg62
+%files -n libjpeg%{major}
 %defattr(-,root,root)
-%{_libdir}/libjpeg.so.62.0.0
-%{_libdir}/libjpeg.so.62
+%{_libdir}/libjpeg.so.%{libver}
+%{_libdir}/libjpeg.so.%{major}
 
-%files -n libjpeg62-devel
+%files -n libjpeg%{major}-devel
 %defattr(-,root,root)
 /usr/include/*.h
 %{_libdir}/libjpeg.so