[libextractor/f18] Revert "Fix up macros and cleanup spec"

ensc ensc at fedoraproject.org
Sun Oct 21 02:41:05 UTC 2012


commit 4835416e56768edf938f499af19cd4ae01d7e14d
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Oct 21 04:40:28 2012 +0200

    Revert "Fix up macros and cleanup spec"
    
    This reverts commit 27ad7e510efce20347403c38686afae0a32cbdd9.

 libextractor.spec |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/libextractor.spec b/libextractor.spec
index f3fd918..3d00ee4 100644
--- a/libextractor.spec
+++ b/libextractor.spec
@@ -11,7 +11,7 @@
 
 Name:		libextractor
 Version:	0.6.3
-Release:	%release_func 1805.1
+Release:	%release_func 1805
 Summary:	Simple library for keyword extraction
 
 Group:		System Environment/Libraries
@@ -20,6 +20,7 @@ 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
 Source10:	README.fedora
+BuildRoot:	%_tmppath/%name-%version-%release-root
 
 BuildRequires:	gettext zzuf
 BuildRequires:	libtool-ltdl-devel
@@ -154,6 +155,7 @@ make # %{?_smp_mflags}
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -200,6 +202,10 @@ export LIBEXTRACTOR_PREFIX=$RPM_BUILD_ROOT%{_libdir}/libextractor
 make check
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %post
 /sbin/ldconfig
 /sbin/install-info --info-dir %_infodir %_infodir/extractor.info || :
@@ -211,27 +217,27 @@ test $1 != 0 || /sbin/install-info --info-dir %_infodir --delete %_infodir/extra
 
 
 %files -f libextractor.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README* TODO
-%{_bindir}/*
-%{_libdir}/*.so.*
-%{_infodir}/*info*
-%{_mandir}/man1/*
+%_bindir/*
+%_libdir/*.so.*
+%_infodir/*info*
+%_mandir/man1/*
 %dir %plugindir
 
 %files plugins
 %files plugins-base -f filelists.base
 
 %files devel
-%{_includedir}/*
-%{_libdir}/*.so
-%{_mandir}/man3/*
-%{_libdir}/pkgconfig/*
+%defattr(-,root,root,-)
+%doc
+%_includedir/*
+%_libdir/*.so
+%_mandir/man3/*
+%_libdir/pkgconfig/*
 
 
 %changelog
-* Sat Oct 20 2012 Peter Robinson <pbrobinson at fedoraproject.org> 0.6.3-1805.1
-- Fix up macros and cleanup spec
-
 * Sun Jul 22 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.3-1805
 - fixed arm build issue by using wildcard in ld-linux detection
 


More information about the scm-commits mailing list