[libsbml] Update pc patch to latest version

Zbigniew Jędrzejewski-Szmek zbyszek at fedoraproject.org
Mon Feb 9 15:01:47 UTC 2015


commit 1e3790c8d8ceb555d4856093df286c7b7e4e8ebb
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 6 16:13:10 2015 -0500

    Update pc patch to latest version

 trim-pc-file.diff |   63 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 42 insertions(+), 21 deletions(-)
---
diff --git a/trim-pc-file.diff b/trim-pc-file.diff
index 005fd64..b9ef4c7 100644
--- a/trim-pc-file.diff
+++ b/trim-pc-file.diff
@@ -1,39 +1,60 @@
-diff --git libSBML-5.11.0-Source/Makefile.in~ libSBML-5.11.0-Source/Makefile.in
-index 6d5913ba04..d6fd8dc067 100644
---- libSBML-5.11.0-Source/Makefile.in~
+diff --git libSBML-5.11.0-Source/Makefile.in.old libSBML-5.11.0-Source/Makefile.in
+index 6d5913ba04..12cd2a21b7 100644
+--- libSBML-5.11.0-Source/Makefile.in.old
 +++ libSBML-5.11.0-Source/Makefile.in
-@@ -644,30 +644,19 @@ DEPENDENCY_LIBFLAGS = ${XML_LDFLAGS} ${COMPRESS_LDFLAGS} ${XML_LIBS} ${COMPRESS_
+@@ -628,7 +628,7 @@ tags: etags-recursive ctags-recursive
+ # libsbml.pc.
+ # -----------------------------------------------------------------------------
+ 
+-base-libs = -lsbml -lstdc++ -lm
++base-libs = -lstdc++ -lm
+ 
+ COMPRESS_CPFLAGS    = ${ZLIB_CPPFLAGS} ${BZ2_CPPFLAGS}
+ COMPRESS_LDFLAGS    = ${ZLIB_LDFLAGS} ${BZ2_LDFLAGS}
+@@ -643,32 +643,25 @@ DEPENDENCY_LIBFLAGS = ${XML_LDFLAGS} ${COMPRESS_LDFLAGS} ${XML_LIBS} ${COMPRESS_
+ 
  libsbml.pc: Makefile
  	@rm -f libsbml.pc
- 	@echo "Name: @PACKAGE_NAME@"                   > libsbml.pc
+-	@echo "Name: @PACKAGE_NAME@"                   > libsbml.pc
 -	@echo "Description: An API library for reading/writing/manipulating SBML" >> libsbml.pc
-+	@echo "Description: An library for reading/writing/manipulating SBML" >> libsbml.pc
- 	@echo "URL: http://sbml.org/Software/libSBML" >> libsbml.pc
- 	@echo "Version: @PACKAGE_VERSION@"            >> libsbml.pc
- 	@echo ""                                      >> libsbml.pc
- 	@echo "prefix=@prefix@"                       >> libsbml.pc
+-	@echo "URL: http://sbml.org/Software/libSBML" >> libsbml.pc
+-	@echo "Version: @PACKAGE_VERSION@"            >> libsbml.pc
+-	@echo ""                                      >> libsbml.pc
+-	@echo "prefix=@prefix@"                       >> libsbml.pc
 -	@echo "exec_prefix=@exec_prefix@"             >> libsbml.pc
- 	@echo "libdir=@libdir@"                       >> libsbml.pc
- 	@echo "includedir=@includedir@"               >> libsbml.pc
- 	@echo ""                                      >> libsbml.pc
-+	@echo "Libs: -L\$${libdir} -lsbml"            >> libsbml.pc
-+	@echo "Cflags: -I\$${includedir}"             >> libsbml.pc
+-	@echo "libdir=@libdir@"                       >> libsbml.pc
+-	@echo "includedir=@includedir@"               >> libsbml.pc
+-	@echo ""                                      >> libsbml.pc
++	@echo "Name: @PACKAGE_NAME@"                                         > libsbml.pc
++	@echo "Description: A library for reading/writing/manipulating SBML" >> libsbml.pc
++	@echo "URL: http://sbml.org/Software/libSBML"                        >> libsbml.pc
++	@echo "Version: @PACKAGE_VERSION@"                                   >> libsbml.pc
++	@echo ""                                                             >> libsbml.pc
++	@echo "prefix=@prefix@"                                              >> libsbml.pc
++	@echo "libdir=@libdir@"                                              >> libsbml.pc
++	@echo "includedir=@includedir@"                                      >> libsbml.pc
++	@echo ""                                                             >> libsbml.pc
++	@echo "Libs: -L\$${libdir} -lsbml"                                   >> libsbml.pc
++	@echo "Libs.private: ${DEPENDENCY_LIBFLAGS} ${base-libs}"            >> libsbml.pc
++	@echo "Cflags: -I\$${includedir}"                                    >> libsbml.pc
  ifdef USE_XERCES
 -	@echo "Libs: -L\$${libdir} ${DEPENDENCY_LIBFLAGS} ${base-libs}" >> libsbml.pc
 -	@echo "Cflags: -I\$${includedir} ${DEPENDENCY_CPPFLAGS}" >> libsbml.pc
 -	@echo "Conflicts: xerces-c = 2.6.0" >> libsbml.pc
-+	@echo "Conflicts: xerces-c = 2.6.0"           >> libsbml.pc
- endif
+-endif
 -ifdef USE_EXPAT
 -	@echo "Libs: -L\$${libdir} ${DEPENDENCY_LIBFLAGS} ${base-libs}" >> libsbml.pc
 -	@echo "Cflags: -I\$${includedir} ${DEPENDENCY_CPPFLAGS}"  >> libsbml.pc
--endif
--ifdef USE_LIBXML
++	@echo "Conflicts: xerces-c = 2.6.0"                                  >> libsbml.pc
+ endif
+ ifdef USE_LIBXML
 -	@echo "Libs: -L\$${libdir} ${DEPENDENCY_LIBFLAGS} ${base-libs}" >> libsbml.pc
 -	@echo "Cflags: -I\$${includedir} ${DEPENDENCY_CPPFLAGS}"        >> libsbml.pc
 -	@echo "Requires: libxml-2.0 >= 2.6.22" >> libsbml.pc
--endif
--
++	@echo "Requires.private: libxml-2.0 >= 2.6.22" 	                     >> libsbml.pc
+ endif
  
+-
  # -----------------------------------------------------------------------------
  # Installation.
+ # -----------------------------------------------------------------------------


More information about the scm-commits mailing list