[libguess] Use %_isa in -devel package dependency. Drop %defattr lines.

Michael Schwendt mschwendt at fedoraproject.org
Fri Sep 16 19:48:22 UTC 2011


commit f0580b928ef75227f40e8a18544c81d7f403d6db
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Sep 16 21:48:10 2011 +0200

    Use %_isa in -devel package dependency.
    Drop %defattr lines.

 libguess.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libguess.spec b/libguess.spec
index 434c063..38af0ce 100644
--- a/libguess.spec
+++ b/libguess.spec
@@ -1,6 +1,6 @@
 Name: libguess
 Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Summary: High-speed character set detection library
 Group: System Environment/Libraries
@@ -25,7 +25,7 @@ operations.
 %package devel
 Summary: Files needed for developing with %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains the files that are needed when building
@@ -43,7 +43,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 
 
 %post -p /sbin/ldconfig
@@ -52,13 +52,11 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_libdir}/%{name}.so.1
 %{_libdir}/%{name}.so.1.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/%{name}.so
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/%{name}.h
@@ -66,6 +64,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 
 %changelog
+* Fri Sep 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-3
+- Use %%_isa in -devel package dependency.
+- Drop %%defattr lines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list