| 96014412 | 2015-01-01 15:47:13 | François Andriot |
RPM packaging: update pytdeextensions |
||
|
M redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1.spec R redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.spec |
||
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
deleted file mode 100644
index 40177c2..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-do_not_link_stdc++.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ori 2012-08-05 09:04:21.430039677 +0000
-+++ pykdeextensions/src/kdedistutils.py 2012-08-05 09:04:33.013847354 +0000
-@@ -820,7 +820,7 @@
- linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
- linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
- linklist.append("-lm")
-- linklist.append("-lstdc++")
-+# linklist.append("-lstdc++")
- linklist.append("-lc")
- linklist.append(self.clib)
-
-@@ -1734,7 +1734,7 @@
- linklist.append("-L"+self.kde_lib_dir); linklist.append("-L/opt/trinity/lib"); linklist.append("-lkdecore"); linklist.append("-lpythonize")
- linklist.append("-L"+self.qt_lib_dir); linklist.append("-lqt-mt")
- linklist.append("-lm")
-- linklist.append("-lstdc++")
-+# linklist.append("-lstdc++")
- linklist.append("-lc")
- linklist.append(self.clib)
-
---- pykdeextensions/setup.py.ORI 2012-08-05 09:07:01.588332389 +0000
-+++ pykdeextensions/setup.py 2012-08-05 09:07:07.795225579 +0000
-@@ -223,7 +223,7 @@
- linklist.extend(sysconfig.get_config_var("LIBS").split())
-
- linklist.append("-lm")
-- linklist.append("-lstdc++")
-+# linklist.append("-lstdc++")
- linklist.append("-lc")
- linklist.append(self.clib)
-
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
deleted file mode 100644
index 3b89e24..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.libtool 2012-05-11 23:45:11.738618661 +0200
-+++ pykdeextensions/src/kdedistutils.py 2012-05-11 23:46:11.469447204 +0200
-@@ -712,6 +712,7 @@
-
- # Build the 'stub' code.
- cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+ "extramodule": os.getenv("EXTRA_MODULE_DIR"),
- "modulename": modulename,
- "factoryfunction": factoryfunction,
- "python_version": python_version}
-@@ -855,7 +856,7 @@
- #include <sip.h>
-
- #define MODULE_DIR "%(moduledir)s"
--#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
- #define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
- #define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
- #define MODULE_NAME "%(modulename)s"
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
deleted file mode 100644
index 05ac80b..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_include_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.ORI 2012-08-27 22:10:18.873738368 +0200
-+++ pykdeextensions/src/kdedistutils.py 2012-08-27 22:10:50.234094262 +0200
-@@ -539,7 +539,7 @@
- canidatepaths.append(os.path.join(kdedir,"include"))
- canidatepaths.append(os.path.join(install.prefix,"include"))
- canidatepaths.append('/opt/trinity/include')
-- canidatepaths.append('/opt/kde/include')
-+ canidatepaths.append('/opt/trinity/include/kde')
- self.kde_inc_dir = FindFileInPaths('kapplication.h',canidatepaths)
- if self.kde_inc_dir is None:
- raise SystemExit, "Failed to find the KDE header file directory."
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
deleted file mode 100644
index b7db0c2..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libsuffix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 32d597f993f2566f7bdfec8a29c916b4c9b1a803
-Author: Darrell Anderson <humanreadable@...>
-Date: 1339639807 -0500
-
- Reverse an old Debian-specific patch that prevents building on
- some 64-bit systems. Add text to help with basic debugging.
-
-diff --git a/setup.py b/setup.py
-index e51f0fa..e7ec147 100755
---- a/setup.py
-+++ b/setup.py
-@@ -135,7 +135,7 @@ class BuildLibpythonize(Command):
- if self.clib!=None:
- self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
- if self.clib is None:
-- raise SystemExit, "Failed to find a suitable libgcc library"
-+ raise SystemExit, "setup.py: Failed to find a suitable libgcc library"
- self.announce("Using %s for clib" % self.clib)
-
- # Make a list of places to look for python .so modules
-diff --git a/src/kdedistutils.py b/src/kdedistutils.py
-index b8b3743..b8e23f3 100644
---- a/src/kdedistutils.py
-+++ b/src/kdedistutils.py
-@@ -660,7 +660,7 @@ class BuildKControlModule(Command):
- if self.clib!=None:
- self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
- if self.clib is None:
-- raise SystemExit, "Failed to find a suitable libgcc library"
-+ raise SystemExit, "kdedistutils.py (1): Failed to find a suitable libgcc library"
- self.announce("Using %s for clib" % self.clib)
-
- # Make a list of places to look for python .so modules
-@@ -1591,7 +1591,7 @@ class BuildKioslave(Command):
- if self.clib!=None:
- self.clib = glob.glob(os.path.join(self.clib,'libgcc*.a'))[0]
- if self.clib is None:
-- raise SystemExit, "Failed to find a suitable libgcc library"
-+ raise SystemExit, "kdedistutils.py (2): Failed to find a suitable libgcc library"
- self.announce("Using %s for clib" % self.clib)
-
- # Make a list of places to look for python .so modules
-@@ -2229,7 +2229,7 @@ def compile_qtdesigner(ui_files,
-
- ###########################################################################
- def get_libdir_name():
-- #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
-- # return 'lib64'
-- #else:
-+ if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
-+ return 'lib64'
-+ else:
- return 'lib'
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
deleted file mode 100644
index 44c50bd..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13-fix_libtool.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pykdeextensions/src/kdedistutils.py.libtool 2011-08-21 23:01:12.000000000 +0200
-+++ pykdeextensions/src/kdedistutils.py 2012-05-11 23:41:07.326232457 +0200
-@@ -790,6 +791,8 @@
- cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
- # link_flags
- cmdlist.append("-module")
-+ cmdlist.append("-avoid-version")
-+ cmdlist.append("-shared")
- cmdlist.append("-export-dynamic")
- # object
- cmdlist.append(outputfile)
-@@ -1703,6 +1705,8 @@
- cmdlist.append(sysconfig.get_config_var("LDSHARED").split()[0])
- # link_flags
- cmdlist.append("-module")
-+ cmdlist.append("-avoid-version")
-+ cmdlist.append("-shared")
- cmdlist.append("-export-dynamic")
- # object
- cmdlist.append(outputfile)
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
deleted file mode 100644
index 2a1cfee..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_extra_module_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.extramodule 2012-09-08 17:33:05.000000000 +0000
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-02 19:19:40.185384207 +0000
-@@ -712,6 +712,7 @@
-
- # Build the 'stub' code.
- cppcode = self.cpptemplate % {"moduledir": self.data_dir,
-+ "extramodule": os.getenv("EXTRA_MODULE_DIR"),
- "modulename": modulename,
- "factoryfunction": factoryfunction,
- "python_version": python_version}
-@@ -854,6 +855,7 @@
- #include <sip.h>
-
- #define MODULE_DIR "%(moduledir)s"
-+#define EXTRA_MODULE_DIR "%(extramodule)s"
- #define MODULE_NAME "%(modulename)s"
- #define FACTORY "%(factoryfunction)s"
- #define CPP_FACTORY %(factoryfunction)s
diff --git a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch b/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
deleted file mode 100644
index 720b8bd..0000000
--- a/redhat/libraries/pytdeextensions/pykdeextensions-3.5.13.1-fix_libgcc_detection.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- pykdeextensions-3.5.13.1/setup.py.libgcc 2012-09-08 11:59:03.000000000 +0200
-+++ pykdeextensions-3.5.13.1/setup.py 2012-10-06 12:52:03.768762713 +0200
-@@ -126,7 +126,7 @@
-
- # Find the C library (libgcc, libgcc_s or some other variation).
- if self.clib is None:
-- canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name() ]
-+ canidatepaths = ["/usr/"+kdedistutils.get_libdir_name(), "/usr/local/"+kdedistutils.get_libdir_name(), "/usr/lib" ]
- self.clib = kdedistutils.FindFileInPaths("libgcc*.so",canidatepaths)
- if self.clib!=None:
- self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
---- pykdeextensions-3.5.13.1/src/kdedistutils.py.libgcc 2012-10-06 13:29:31.920413352 +0200
-+++ pykdeextensions-3.5.13.1/src/kdedistutils.py 2012-10-06 13:31:23.440538658 +0200
-@@ -564,6 +564,9 @@
- # Qt inc dir
- if self.qt_inc_dir is None:
- canidatepaths = []
-+ qtinc = os.getenv("QTINC")
-+ if qtinc != None:
-+ canidatepaths.append(qtinc)
- qtdir = os.getenv("QTDIR")
- if qtdir != None:
- canidatepaths.append(os.path.join(qtdir,"include"))
-@@ -585,6 +588,9 @@
- # Qt lib dir
- if self.qt_lib_dir is None:
- canidatepaths = []
-+ qtlib = os.getenv("QTLIB")
-+ if qtlib != None:
-+ canidatepaths.append(qtlib)
- qtdir = os.getenv("QTDIR")
- if qtdir != None:
- canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
-@@ -634,7 +640,7 @@
-
- # Find the C library (libgcc, libgcc_s or some other variation).
- if self.clib is None:
-- canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name() ]
-+ canidatepaths = ["/usr/"+get_libdir_name(), "/usr/local/"+get_libdir_name(), "/usr/lib" ]
- self.clib = FindFileInPaths("libgcc*.so",canidatepaths)
- if self.clib!=None:
- self.clib = glob.glob(os.path.join(self.clib,'libgcc*.so'))[0]
-@@ -1481,6 +1487,9 @@
- # Qt inc dir
- if self.qt_inc_dir is None:
- canidatepaths = []
-+ qtinc = os.getenv("QTINC")
-+ if qtinc != None:
-+ canidatepaths.append(qtinc)
- qtdir = os.getenv("QTDIR")
- if qtdir != None:
- canidatepaths.append(os.path.join(qtdir,"include"))
-@@ -1501,6 +1510,9 @@
- # Qt lib dir
- if self.qt_lib_dir is None:
- canidatepaths = []
** Diff limit reached (max: 250 lines) **
|
||