Changeset 12654 for packaging/centuryegg

Timestamp:

01/21/11 06:59:42 (16 months ago)

Author:

build

Message:

Some Centos 4 fixes. Support for packaging versions as well as package versions

Files:

• packaging/centuryegg/find-srpms (modified) (7 diffs)

packaging/centuryegg/find-srpms

@@ -158 +158 @@
 for p in packages:
     min_p_version = None
+    min_package_version = 0
     if ">=" in p:
         p, min_p_version = p.split(">=")
         min_p_version = min_p_version.strip()
+        if "-" in min_p_version:
+            min_p_version, min_package_version = min_p_version.split("-")
+            min_package_version = int(min_package_version)
         min_p_version = [int(m) for m in min_p_version.split(".")]
     p = p.strip()
@@ -190 +194 @@
             elif min_p_version:
                 s_version = s.replace(p,"")
+                s_package_version = s_version.split("-")[2].split(".")[0]
                 s_version = s_version.split("-")[1]
                 sd_version = []
@@ -201 +206 @@
                         break
                     elif v > s_version[n]:
+                        srpms.remove(s)
+                        break
+                    elif v == s_version[n] and min_package_version > int(s_package_version):
                         srpms.remove(s)
                         break
@@ -225 +233 @@
     package_name = ""
     defines = {}
+    if p == "python-sqlalchemy" and version <= 4:
+        # In RedHat 4, strip off the first 8 lines - boolean logic old rpmtools can't handle
+        lines = [lines[1]] + lines[8:]
     for line in lines:
         if line.startswith("%define"):
@@ -232 +243 @@
             if "-n" not in line:
                 line = line.rstrip("\n") + " -n %{name}-%{version}\n"
-        if replace_python and "python " in line and "setup.py" in line:
+        if replace_python and "python " in line:
             line = line.replace("/usr/bin/python ","%{__python} ").replace("python ", "%{__python} ")
             line_parts = line.split()
@@ -303 +314 @@
                 specfile.write("%%{python_sitearch}/matplotlib-*-py%s.egg-info\n" % python_version)
             continue
-        if "_xmlplus" in line and package_name == "PyXML":
+        if "_xmlplus" in line and package_name == "PyXML" and version > 4:
             specfile.write("%%{_libdir}/python%%pyver/site-packages/%s-*-py%s.egg-info\n" % (package_name, python_version))
         if "_bindir" in line and package_name == "PyXML":
@@ -319 +330 @@
         if package_name == "protobuf" and "py2.5" in line:
             line = line.replace("py2.5", "py%s" % python_version)
+        if version <= 4 and package_name == "python-sqlalchemy" and "filter_setup" in line or "filter_provides" in line:
+            continue
         specfile.write(line)
     specfile.close()