rpms/openbabel/devel openbabel-python-ppc64.patch,1.1,1.2

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Fri Jun 6 18:37:55 UTC 2008 

Author: kkofler

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1401/devel

Modified Files:
	openbabel-python-ppc64.patch 
Log Message:
Fix patch to actually apply:
* omit the scripts/Makefile.in hunks, we run autoreconf anyway,
* omit the scripts/perl/Makefile.PL hunk which is unrelated and unnecessary.

openbabel-python-ppc64.patch:

Index: openbabel-python-ppc64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-python-ppc64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openbabel-python-ppc64.patch	6 Jun 2008 18:24:19 -0000	1.1
+++ openbabel-python-ppc64.patch	6 Jun 2008 18:37:06 -0000	1.2
@@ -228,109 +228,6 @@
 +import obcore
 +import obconversion
 +import obtemplate
-Index: scripts/Makefile.in
-===================================================================
---- scripts/Makefile.in	(revision 2534)
-+++ scripts/Makefile.in	(revision 2535)
-@@ -34,8 +34,12 @@
- subdir = scripts
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
--	$(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/autoconf/libtool.m4 \
-+	$(top_srcdir)/autoconf/ltoptions.m4 \
-+	$(top_srcdir)/autoconf/ltsugar.m4 \
-+	$(top_srcdir)/autoconf/ltversion.m4 \
-+	$(top_srcdir)/autoconf/lt~obsolete.m4 \
-+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -89,6 +93,7 @@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
-@@ -98,6 +103,8 @@
- NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -173,6 +180,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = openbabel-perl.i perl \
-@@ -185,9 +193,11 @@
- # build the scripting language interfaces if --enable-maintainer-mode was set
- # and SWIG is available -- please use the most recent version of SWIG
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at BUILT_SOURCES = perl/openbabel_perl.cpp \
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	python/openbabel_python.cpp \
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	java/openbabel_java.cpp \
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	csharp/openbabel_csharp.cpp \
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	python/obcore.cpp \
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	python/obconversion.cpp \
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	python/obtemplate.cpp \
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	$(am__append_1)
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at script_includes = $(top_srcdir)/include/openbabel
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at script_headers = $(script_includes)/mol.h $(script_includes)/obconversion.h \
-@@ -386,20 +396,18 @@
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	sed -e "s/^@EXPORT.*/& sub dl_load_flags { 0x01 }/" <perl/OpenBabel.pm >perl/OpenBabel.new;
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	mv perl/OpenBabel.new perl/OpenBabel.pm;
- 
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at python/openbabel_python.cpp: openbabel-python.i $(script_headers)
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at python/obconversion.cpp: openbabel-python2.i $(script_headers)
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	$(SWIG) -small -O -python -templatereduce -naturalvar \
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@		-c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "import sys" >python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "if sys.platform.find(\"linux\") != -1:"  >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "    try:" >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "        import dl" >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "    except ImportError:" >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "        import DLFCN as dl" >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo "    sys.setdlopenflags(sys.getdlopenflags() | dl.RTLD_GLOBAL)" >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	echo >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	cat python/openbabel.py >>python/ob.py;
-- at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	mv python/ob.py python/openbabel.py;
- 
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at python/obtemplate.cpp: openbabel-python3.i $(script_headers)
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	$(SWIG) -small -O -python -templatereduce -naturalvar \
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@		-c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
-+
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at python/obcore.cpp: openbabel-python.i $(script_headers)
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	$(SWIG) -small -O -python -templatereduce -naturalvar \
-+ at BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@		-c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
-+
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE at java/openbabel_java.cpp: openbabel-java.i $(script_headers)
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	$(SWIG) -small -O -java -naturalvar -templatereduce -c++ -o $@ \
- @BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@	-I$(top_srcdir)/include -I$(top_builddir)/include $<;
-Index: scripts/perl/Makefile.PL
-===================================================================
---- scripts/perl/Makefile.PL	(revision 2534)
-+++ scripts/perl/Makefile.PL	(revision 2535)
-@@ -9,9 +9,9 @@
- 
- # check if we're compiling in the source directory
- $ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
-+    if (-r "$srcdir/.libs/libopenbabel.dylib") and (-s _) and (-B _);
-+$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
-     if (-r "$srcdir/.libs/libopenbabel.so") and (-s _) and (-B _);
--$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
--    if (-r "$srcdir/.libs/libopenbabel.dylib") and (-s _) and (-B _);
- $ldfrom = "\$(OBJECT) $srcdir/.libs/libopenbabel.a -lz"
-     if (-r "$srcdir/.libs/libopenbabel.a") and (-s _) and (-B _);
- 
 Index: scripts/Makefile.am
 ===================================================================
 --- scripts/Makefile.am	(revision 2534)

More information about the fedora-extras-commits mailing list