[sha] Fix to move header files in a subdirectory in /usr/include for package devel of sha

Eduardo Javier Echeverria Alvarado echevemaster at fedoraproject.org
Sun Dec 23 18:28:55 UTC 2012


commit d83fff9329a2fdb32093155fc036808e7976a9a3
Author: Eduardo Echeverria <echevemaster at gmail.com>
Date:   Sun Dec 23 13:55:45 2012 -0430

    Fix to move header files in a subdirectory in /usr/include for package devel of sha

 sha.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/sha.spec b/sha.spec
index 410f73b..ccfac05 100644
--- a/sha.spec
+++ b/sha.spec
@@ -2,7 +2,7 @@ Name:		sha
 #Upstream will continue in the next version 
 #with the behavior of shared libraries (specifically version 1.2)
 Version:	1.0.4b
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	File hashing utility
 License:	BSD
 URL:		http://hg.saddi.com/sha-asaddi
@@ -40,8 +40,8 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install
 rm -f %{buildroot}/%{_libdir}/*.la
-mkdir -p %{buildroot}/%{_includedir}
-install -pm 644 *.h %{buildroot}/%{_includedir}
+mkdir -p %{buildroot}/%{_includedir}/sha
+install -pm 644 *.h %{buildroot}/%{_includedir}/sha
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -56,15 +56,20 @@ install -pm 644 *.h %{buildroot}/%{_includedir}
 
 %files devel
 %doc LICENSE README.SHA
-%{_includedir}/*.h
+%dir %{_includedir}/%{name}/
+%{_includedir}/%{name}/*.h
 %{_libdir}/*.so
 
 %changelog
+* Fri Dec 21 2012 Eduardo Echeverria  <echevemaster at gmail.com> - 1.0.4b-2
+- Moved headers files in devel package to subdirectory in /usr/include based
+  on https://fedoraproject.org/wiki/Packaging:Conflicts#Header_Name_Conflicts 
+
 * Sun Oct 28 2012 Eduardo Echeverria  <echevemaster at gmail.com> - 1.0.4b-1
 - Update to version 1.0.4b includes separate license, provided by upstream
 - Remove macro clean
 
-* Thu Oct 22 2012 Eduardo Echeverria  <echevemaster at gmail.com> - 1.0.4a-4
+* Mon Oct 22 2012 Eduardo Echeverria  <echevemaster at gmail.com> - 1.0.4a-4
 - Fix incorrect ownership of manpages
 
 * Thu Oct 04 2012 Eduardo Echeverria  <echevemaster at gmail.com> - 1.0.4a-3


More information about the scm-commits mailing list