Changeset 13540

Timestamp:

06/22/11 01:53:45 (11 months ago)

Author:

build

Message:

Correct our wrong way of trying to fix the protobuf spec file

Files:

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

packaging/centuryegg/find-srpms

@@ -236 +236 @@
         # In RedHat 4, strip off the first 8 lines - boolean logic old rpmtools can't handle
         lines = [lines[1]] + lines[8:]
-    if p == "protobuf" and version <= 5:
-        lines = [lines[8]] + lines[10:]
-        lines = lines[:18] + lines[21:]
     for line in lines:
         if line.startswith("%define"):
@@ -246 +243 @@
             if "-n" not in line:
                 line = line.rstrip("\n") + " -n %{name}-%{version}\n"
-        if replace_python and "python " in line:
+        if replace_python and "python " in line and "with_python" not in line:
             line = line.replace("/usr/bin/python ","%{__python} ").replace("python ", "%{__python} ")
             line_parts = line.split()
@@ -336 +333 @@
         if package_name == "python-sqlite2" and line.startswith("%dir %{python_sitearch}"):
             specfile.write("%%{python_sitearch}/pysqlite-*-py%s.egg-info\n" % python_version)
-        if package_name == "protobuf" and "py2.6" in line:
-            line = line.replace("py2.6", "py%s" % python_version)
+        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
@@ -382 +379 @@
             rpmdefines.extend(["--define", '"_without_java 1"'])
             rpmdefines.extend(["--define", '"_without_gtest 1"'])
+            rpmdefines.extend(["--define", '"_without_python 0"'])
         else:
             rpmdefines.extend(["--define", "_without_java 1"])
             rpmdefines.extend(["--define", "_without_gtest 1"])
+            rpmdefines.extend(["--define", '_without_python 0'])
     print "Build arguments: ",["rpmbuild"]+rpmdefines+["-ba",new_specfile_name]
     retcode = subprocess.call(["rpmbuild"] + rpmdefines + ["-ba", new_specfile_name], stdout=logfile, stderr=logfile)