[cfitsio] Drop incluedir mod in package config file (bug #782213)

Orion Poplawski orion at fedoraproject.org
Mon Jan 16 21:24:28 UTC 2012


commit 300302be8012f82323a406d00a03a1d2b17bcaec
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jan 16 14:24:25 2012 -0700

    Drop incluedir mod in package config file (bug #782213)

 cfitsio.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/cfitsio.spec b/cfitsio.spec
index 8c55560..c137258 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,6 +1,6 @@
 Name: cfitsio
 Version: 3.290
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Library for manipulating FITS data files
 Group: Development/Libraries
 License: MIT
@@ -83,8 +83,6 @@ sed -e 's|3.29|3.290|' -i cfitsio.pc.in
 sed -e 's|Libs: -L${libdir} -lcfitsio @LIBS@|Libs: -L${libdir} -lcfitsio|' -i cfitsio.pc.in
 sed -e 's|Libs.private: -lm|Libs.private: @LIBS@ -lz -lm|' -i cfitsio.pc.in 
 sed -e 's|Cflags: -I${includedir}|Cflags: -D_REENTRANT -I${includedir}|' -i cfitsio.pc.in
-# Manually fix pkgconfig .pc.in file (BZ 436539, BZ 618291)
-sed -e 's|includedir=@includedir@|includedir=@includedir@/cfitsio|' -i cfitsio.pc.in
 
 rm zlib.h zconf.h
 
@@ -144,6 +142,9 @@ cp -p f{,un}pack %{buildroot}%{_bindir}/
 %{_bindir}/funpack
 
 %changelog
+* Mon Jan 16 2012 Orion Poplawski <orion at cora.nwra.com> - 3.290-4
+- Drop incluedir mod in package config file (bug #782213)
+
 * Fri Jan 06 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.290-3
 - Adding the libz patch
 


More information about the scm-commits mailing list