[libpolyxmass] Don't run the autotools (Fix FTFBS, RHBZ #1106064).

corsepiu corsepiu at fedoraproject.org
Wed Jun 11 00:48:27 UTC 2014


commit ef4fad9e67d2543f0fe3415dae2b536f8ac61cb5
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Jun 11 02:48:14 2014 +0200

    Don't run the autotools (Fix FTFBS, RHBZ #1106064).
    
    - Rebase libpolyxmass-x86_64.patch.
    - Remove BR: autoconf, automake, libtool.
    - Fix broken %changelog entries.
    - Modernize spec.

 libpolyxmass-x86_64.patch |   19 ++++++++++++++--
 libpolyxmass.spec         |   51 ++++++++++++++++++--------------------------
 2 files changed, 37 insertions(+), 33 deletions(-)
---
diff --git a/libpolyxmass-x86_64.patch b/libpolyxmass-x86_64.patch
index 9be2b2b..decff7e 100644
--- a/libpolyxmass-x86_64.patch
+++ b/libpolyxmass-x86_64.patch
@@ -1,6 +1,19 @@
---- Makefile.am.orig	2005-10-21 09:28:40.000000000 +0200
-+++ Makefile.am	2005-10-21 09:30:22.000000000 +0200
-@@ -26,7 +26,7 @@
+diff -Naur libpolyxmass-0.9.1.orig/Makefile.am libpolyxmass-0.9.1/Makefile.am
+--- libpolyxmass-0.9.1.orig/Makefile.am	2005-12-22 01:52:33.000000000 +0100
++++ libpolyxmass-0.9.1/Makefile.am	2014-06-11 01:48:21.875480101 +0200
+@@ -25,7 +25,7 @@
+ TODO
+ 
+ 
+-libpolyxmass_pkgconfigdir = $(prefix)/lib/pkgconfig
++libpolyxmass_pkgconfigdir = $(libdir)/pkgconfig
+ libpolyxmass_pkgconfig_DATA = $(PACKAGE).pc
+ 
+ man_MANS = libpolyxmass.7
+diff -Naur libpolyxmass-0.9.1.orig/Makefile.in libpolyxmass-0.9.1/Makefile.in
+--- libpolyxmass-0.9.1.orig/Makefile.in	2006-04-18 11:42:57.000000000 +0200
++++ libpolyxmass-0.9.1/Makefile.in	2014-06-11 01:49:13.913883612 +0200
+@@ -201,7 +201,7 @@
  TODO
  
  
diff --git a/libpolyxmass.spec b/libpolyxmass.spec
index 6c590f0..94770be 100644
--- a/libpolyxmass.spec
+++ b/libpolyxmass.spec
@@ -7,14 +7,14 @@ Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.polyxmass.org
 Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.1/libpolyxmass-0.9.1.tar.gz
+# Fix up autotool-sources and generated files
+# Note: This package's auto*files are too old and incompatible to automake > 1.13.4
 Patch0:         libpolyxmass-x86_64.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glib2-devel
 BuildRequires: pkgconfig
 BuildRequires: libxml2-devel
 BuildRequires: zlib-devel
-BuildRequires: autoconf automake libtool
 
 %description
 libpolyxmass is a library that implements some housekeeping
@@ -43,10 +43,9 @@ The %{name}-devel package contains the files needed for development with
 
 %prep
 %setup -q
-%patch0
-
-libtoolize
-autoreconf
+%patch0 -p1
+# Fix up time stamps to prevent the autotools from being re-run
+touch -r aclocal.m4 configure configure.in Makefile.in Makefile.am
 
 %build
 export CFLAGS="${RPM_OPT_FLAGS} -Wno-error"
@@ -55,34 +54,35 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=${RPM_BUILD_ROOT}
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_libdir}/*.so.*
 %{_datadir}/man/man7/*
 %exclude %{_datadir}/doc
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/libpolyxmass
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jun 11 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.9.1-13
+- Don't run the autotools (Fix FTFBS, RHBZ #1106064).
+- Rebase libpolyxmass-x86_64.patch.
+- Remove BR: autoconf, automake, libtool.
+- Fix broken %%changelog entries.
+- Modernize spec.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -98,8 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Wed Jul 06 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 0.9.1-7
+* Wed Jul 06 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.1-7
 - fix ftbfs (rhbz#715698)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-6
@@ -117,36 +116,28 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 11 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.1-2
 - Rebuilt for gcc43
 
-* Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.9.1-1
+* Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.1-1
 - version upgrade
 - new license tag
 
-* Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.9.0-7
+* Wed Sep 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.0-7
 - FE6 rebuild
 
-* Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.9.0-6
+* Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.0-6
 - Rebuild for Fedora Extras 5
 
-* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.9.0-5
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.9.0-5
 - version upgrade
 
-* Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.8.9-4
+* Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.8.9-4
 - add dist
 - add patch for x86_64 (pkgconfig dir was wrong)
 
-* Thu Oct 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.8.9-3
+* Thu Oct 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.8.9-3
 - add missing defattr for devel package
 
-* Thu Oct 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.8.9-2
+* Thu Oct 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.8.9-2
 - added missing BuildRequires glib2
 
-* Mon Sep 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.8.9-1
+* Mon Sep 05 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.8.9-1
 - Initial Release


More information about the scm-commits mailing list