Merge pull request #100 from yast/support_for_configure.ac.in

Added a check for configure.ac.in file
yast · Feb 24, 2016 · 96a2a5d · 96a2a5d
2 parents bb93d0e + dda0ad7
commit 96a2a5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/build-tools/rpm/macros.yast b/build-tools/rpm/macros.yast
@@ -71,7 +71,7 @@
 # additional tests are executed (rubocop, spell check...).
 %yast_check \
     %if %{with yast_run_ci_tests} \
-    if [ -f "configure.in.in" ]; then \
+    if [ -f "configure.in.in" -o -f "configure.ac.in" ]; then \
         # TODO: fix the check:ci task to also work with autotools based modules \
         %{__make} check \\\
             VERBOSE=1 \\\
@@ -83,15 +83,15 @@
     fi \
     %else \
     if [ ! -f "%{yast_ydatadir}/devtools/NO_MAKE_CHECK" ]; then \
-        if [ -f "configure.in.in" ]; then \
+        if [ -f "configure.in.in" -o -f "configure.ac.in" ]; then \
             %{__make} check \\\
                 VERBOSE=1 \\\
                 Y2DIR="%{buildroot}/%{yast_dir}" \\\
                 DESTDIR="%{buildroot}" \
         elif [ -f "Rakefile" ]; then \
             rake test:unit \
         else \
-            echo "Cannot run tests, no configure.in.in or Rakefile found" 1>&2 \
+            echo "Cannot run tests, no configure.{ac|in}.in or Rakefile found" 1>&2 \
             exit 1 \
         fi \
     fi \
@@ -114,7 +114,7 @@
 
 # install the yast module using autotools/make
 %yast_install \
-    if [ -f "configure.in.in" ]; then \
+    if [ -f "configure.in.in" -o -f "configure.ac.in" ]; then \
       %make_install \
       # on SUSE run %%yast_check within %%install \
       # other distris may choose to run them during %%check \
@@ -124,7 +124,7 @@
     elif [ -f "Rakefile" ]; then \
       rake install DESTDIR="%{buildroot}" \
     else \
-        echo "Cannot install the package, no configure.in.in or Rakefile found" 1>&2 \
+        echo "Cannot install the package, no configure.{ac|in}.in or Rakefile found" 1>&2 \
         exit 1 \
     fi \
     %yast_desktop_files \
diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 24 09:33:57 UTC 2016 - lslezak@suse.cz
+
+- YaST RPM macros - fix for the previous change: some packages
+  use configure.ac.in instead of the old configure.in.in
+- 3.1.40
+
 -------------------------------------------------------------------
 Tue Feb  9 15:31:34 UTC 2016 - lslezak@suse.cz
 

diff --git a/package/yast2-devtools.spec b/package/yast2-devtools.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-devtools
-Version:        3.1.39
+Version:        3.1.40
 Release:        0
 Url:            http://github.com/yast/yast-devtools