[libextractor] Macro cleanup.

Jon Ciesla limb at fedoraproject.org
Tue Mar 19 13:41:09 UTC 2013 

commit 99122971ddcac21ef0e696b29a735af83f670fac
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 19 08:37:29 2013 -0500

    Macro cleanup.

 libextractor.spec |   75 +++++++++++++++++++++++++++-------------------------
 1 files changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index 4531654..0c95b02 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -1,18 +1,18 @@
-%global plugindir	%_libdir/%name
+%global plugindir	%{_libdir}/%{name}
 %global gtkver		3
 
 Name:		libextractor
 Version:	1.0.1
-Release:	1902%{?dist}
+Release:	1903%{?dist}
 Summary:	Simple library for keyword extraction
 
 Group:		System Environment/Libraries
 License:	GPLv3+
 URL:		http://www.gnu.org/software/libextractor
-Source0:	http://ftp.gnu.org/gnu/libextractor/%name-%version.tar.gz
-Source1:	http://ftp.gnu.org/gnu/libextractor/%name-%version.tar.gz.sig
+Source0:	http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz
+Source1:	http://ftp.gnu.org/gnu/libextractor/%{name}-%{version}.tar.gz.sig
 Source10:	README.fedora
-BuildRoot:	%_tmppath/%name-%version-%release-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	gettext zzuf
 BuildRequires:	libtool-ltdl-devel
@@ -21,26 +21,26 @@ Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
 %package devel
-Summary:	Development files for %name
+Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%name%{?_isa} = %version-%release
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %package plugins
 Summary:	Plugins for libextractor
 Group:		System Environment/Libraries
-Obsoletes:	%name-plugins-pdf < %version
-Obsoletes:	%name-plugins-thumbnailqt < %version
-Requires:	%name = %version-%release
-Requires:	%name-plugins-base
-Requires:	%name-plugins-exiv2
-Requires:	%name-plugins-ogg
-Requires:	%name-plugins-ole2
-Requires:	%name-plugins-thumbnailgtk
-Requires:	%name-plugins-rpm
-Requires:	%name-plugins-tiff
-Requires:	%name-plugins-gif
-Requires:	%name-plugins-mime
-Requires:	%name-plugins-flac
+Obsoletes:	%{name}-plugins-pdf < %{version}
+Obsoletes:	%{name}-plugins-thumbnailqt < %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-plugins-base
+Requires:	%{name}-plugins-exiv2
+Requires:	%{name}-plugins-ogg
+Requires:	%{name}-plugins-ole2
+Requires:	%{name}-plugins-thumbnailgtk
+Requires:	%{name}-plugins-rpm
+Requires:	%{name}-plugins-tiff
+Requires:	%{name}-plugins-gif
+Requires:	%{name}-plugins-mime
+Requires:	%{name}-plugins-flac
 BuildArch:	noarch
 
 
@@ -48,11 +48,11 @@ BuildArch:	noarch
 %package plugins-%1	\
 Summary:	The '%1' libextractor plugin\
 Group:		System Environment/Libraries		\
-Provides:	plugin(%name) = %1 %%{-P*}		\
+Provides:	plugin(%{name}) = %1 %%{-P*}		\
 %%{-u:Requires(post):	/usr/sbin/update-alternatives}	\
 %%{-u:Requires(preun):	/usr/sbin/update-alternatives}	\
 %%{-B:BuildRequires:	%%{-B*}}			\
-Requires:	%name%{?_isa} = %version-%release %%{-R*}	\
+Requires:	%{name}%{?_isa} = %{version}-%{release} %%{-R*}	\
 	\
 %description plugins-%1	\
 libextractor is a simple library for keyword extraction.  libextractor\
@@ -70,7 +70,7 @@ This package ships the '%1' plugin.\
 %package plugins-base
 Summary:	Base plugins for libextractor
 Group:		System Environment/Libraries
-Requires:	%name%{?_isa} = %version-%release
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %pluginpkg flac -B flac-devel
 %pluginpkg exiv2 -B exiv2-devel
@@ -121,14 +121,14 @@ introduce additional dependencies.
 
 
 %description devel
-The %name-devel package contains libraries and header files for
-developing applications that use %name.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 
 %prep
 %setup -q
 
-install -pm644 %SOURCE10 .
+install -pm644 %{SOURCE10} .
 rm -f README.debian
 
 sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-I/usr/include\) !!g' configure
@@ -136,17 +136,17 @@ sed -i 's!\(-L\(/usr\|\$with_qt\)/lib\|-I/usr/include\) !!g' configure
 
 %build
 export ac_cv_lib_mpeg2_mpeg2_init=no
-export lt_cv_sys_dlsearch_path='/%_lib:%_prefix/%_lib:%plugindir'
+export lt_cv_sys_dlsearch_path='/%{_lib}:%{_prefix}/%{_lib}:%plugindir'
 %configure --disable-static	\
 	--disable-rpath		\
 	--disable-xpdf		\
-	CPPFLAGS='-DLIBDIR=\"%_libdir\"'	\
+	CPPFLAGS='-DLIBDIR=\"%{_libdir}\"'	\
 	LDFLAGS='-Wl,--as-needed'
 
 # build with --as-needed and disable rpath
 sed -i \
 	-e 's! -shared ! -Wl,--as-needed\0!g'					\
-	-e '\!sys_lib_dlsearch_path_spec=\"/lib /usr/lib !s!\"/lib /usr/lib !\"/%_lib /usr/%_lib !g'	\
+	-e '\!sys_lib_dlsearch_path_spec=\"/lib /usr/lib !s!\"/lib /usr/lib !\"/%{_lib} /usr/{%_lib} !g'	\
 	libtool
 
 # not SMP safe
@@ -189,17 +189,17 @@ for i in $RPM_BUILD_ROOT%plugindir/*.so; do
 	}
 done
 
-rm -f $RPM_BUILD_ROOT%_infodir/dir
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-mv $RPM_BUILD_ROOT%_bindir/{,libextractor-}extract
-mv $RPM_BUILD_ROOT%_mandir/man1/{,libextractor-}extract.1
+mv $RPM_BUILD_ROOT%{_bindir}/{,libextractor-}extract
+mv $RPM_BUILD_ROOT%{_mandir}/man1/{,libextractor-}extract.1
 
 %find_lang libextractor
 
 
 %check
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%_libdir
-export LIBEXTRACTOR_PREFIX=$RPM_BUILD_ROOT%_libdir/libextractor
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+export LIBEXTRACTOR_PREFIX=$RPM_BUILD_ROOT%{_libdir}/libextractor
 
 ### RPM test in rawhide fails with
 # Got additional meta data of type 58 and format 1 with value `Thu Oct  2 09:44:33 2003' from plugin `rpm'
@@ -219,10 +219,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/sbin/install-info --info-dir %_infodir %_infodir/extractor.info || :
+/sbin/install-info --info-dir %{_infodir} %{_infodir}/extractor.info || :
 
 %preun
-test $1 != 0 || /sbin/install-info --info-dir %_infodir --delete %_infodir/extractor.info || :
+test $1 != 0 || /sbin/install-info --info-dir %{_infodir} --delete %{_infodir}/extractor.info || :
 
 %postun -p /sbin/ldconfig
 
@@ -249,6 +249,9 @@ test $1 != 0 || /sbin/install-info --info-dir %_infodir --delete %_infodir/extra
 
 
 %changelog
+* Tue Mar 19 2013 Jon Ciesla <limburgher at gmail.com> - 1.0.1-1903
+- Additional macro cleanup.
+
 * Thu Feb 28 2013 Jon Ciesla <limburgher at gmail.com> - 1.0.1-1902
 - Fix macros.
 - Fix FTBFS.

More information about the scm-commits mailing list