Hello community,

here is the log from the commit of package python-rpm-macros for 
openSUSE:Factory checked in at 2017-08-22 11:04:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-rpm-macros (Old)
 and      /work/SRC/openSUSE:Factory/.python-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-rpm-macros"

Tue Aug 22 11:04:58 2017 rev:9 rq:517250 version:2017.08.09.32550d0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-rpm-macros/python-rpm-macros.changes      
2017-07-11 08:34:26.250724956 +0200
+++ /work/SRC/openSUSE:Factory/.python-rpm-macros.new/python-rpm-macros.changes 
2017-08-22 11:05:05.862662492 +0200
@@ -1,0 +2,7 @@
+Wed Aug  9 13:37:32 UTC 2017 - [email protected]
+
+- version bump to 2017.08.09.32550d0
+- use %_specfile macro to locate the spec file, this should help with
+  factory-auto bot problems as well as issue#3
+
+-------------------------------------------------------------------

Old:
----
  python-rpm-macros-2017.06.29.107ac7a.tar.bz2

New:
----
  python-rpm-macros-2017.08.09.32550d0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.PSPKfE/_old  2017-08-22 11:05:07.690405064 +0200
+++ /var/tmp/diff_new_pack.PSPKfE/_new  2017-08-22 11:05:07.694404501 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           python-rpm-macros
-Version:        2017.06.29.107ac7a
+Version:        2017.08.09.32550d0
 Release:        0
 Summary:        RPM macros for building of Python modules
 License:        WTFPL

++++++ python-rpm-macros-2017.06.29.107ac7a.tar.bz2 -> 
python-rpm-macros-2017.08.09.32550d0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-rpm-macros-2017.06.29.107ac7a/macros.lua 
new/python-rpm-macros-2017.08.09.32550d0/macros.lua
--- old/python-rpm-macros-2017.06.29.107ac7a/macros.lua 2017-06-29 
15:15:41.000000000 +0200
+++ new/python-rpm-macros-2017.08.09.32550d0/macros.lua 2017-08-09 
15:24:45.000000000 +0200
@@ -53,15 +53,18 @@
     end
 
     -- find the spec file
-    specpath = name .. ".spec"
-    local locations = { rpm.expand("%_sourcedir"), rpm.expand("%_specdir"), 
"." }
-    for _,loc in ipairs(locations) do
-        local filename = loc .. "/" .. specpath
-        if posix.stat(filename, "mode") ~= nil then
-            specpath = filename
-            break
-        end
-    end
+    specpath = rpm.expand("%_specfile")
+
+    -- search possible locations - shouldn't be necessary anymore
+--    local locations = { rpm.expand("%_sourcedir"), rpm.expand("%_specdir"), 
posix.getcwd(), posix.getcwd() .. "/" .. name }
+--    for _,loc in ipairs(locations) do
+--        local filename = loc .. "/" .. name .. ".spec"
+--        if posix.stat(filename, "mode") ~= nil then
+--            io.stderr:write("could not find spec as " .. filename .. "\n")
+--            specpath = filename
+--            break
+--        end
+--    end
 end
 
 function python_subpackages()
@@ -299,7 +302,7 @@
         -- rescan spec for each flavor
         if not is_current_flavor then
             local spec, err = io.open(specpath, "r")
-            if err then print ("bad spec " .. specpath) return end
+            if err then print ("could not find spec at " .. specpath) return 
end
 
             rpm.define("python_flavor " .. python)
 


Reply via email to