From 273850ec6a73b6cfae30e84c8f0ec4616723a20e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 May 2012 16:33:19 -0500 Subject: [PATCH 1/6] rebuild (libtiff) --- kdelibs3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kdelibs3.spec b/kdelibs3.spec index 580ee4a..5b1bca3 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -28,7 +28,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 35%{?dist} +Release: 36%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -589,6 +589,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Tue May 08 2012 Rex Dieter 3.5.10-36 +- rebuild (libtiff) + * Wed Apr 04 2012 Than Ngo - 3.5.10-35 - drop apidocs From 9029b01768eedcc3307291bbcd5785adb44577cf Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Jun 2012 00:29:33 +0200 Subject: [PATCH 2/6] rebuild for fixed GCC (#830618) * Mon Jun 11 2012 Kevin Kofler - 3.5.10-37 - rebuild for fixed GCC (#830618) --- kdelibs3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kdelibs3.spec b/kdelibs3.spec index 5b1bca3..8b81f66 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -28,7 +28,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 36%{?dist} +Release: 37%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -589,6 +589,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Mon Jun 11 2012 Kevin Kofler - 3.5.10-37 +- rebuild for fixed GCC (#830618) + * Tue May 08 2012 Rex Dieter 3.5.10-36 - rebuild (libtiff) From 98b7647b040b9e817dc00bb5b8b0b9769c56942c Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Jun 2012 00:48:09 +0200 Subject: [PATCH 3/6] fix sed syntax in the automake version hack --- kdelibs3.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kdelibs3.spec b/kdelibs3.spec index 8b81f66..367bba8 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -270,7 +270,7 @@ format for easy browsing sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h # hack/fix for newer automake -sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh +sed -iautomake -e 's|automake\*1\.10\*|automake*1.1[0-5]*|' admin/cvs.sh make -f admin/Makefile.common cvs @@ -591,6 +591,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog * Mon Jun 11 2012 Kevin Kofler - 3.5.10-37 - rebuild for fixed GCC (#830618) +- fix sed syntax in the automake version hack * Tue May 08 2012 Rex Dieter 3.5.10-36 - rebuild (libtiff) From e07258505b559fb884ab2d64bb2857068d3e286c Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Jun 2012 00:57:28 +0200 Subject: [PATCH 4/6] debug sed invocation with diff --- kdelibs3.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/kdelibs3.spec b/kdelibs3.spec index 367bba8..4b0eadf 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -271,6 +271,7 @@ sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{versi # hack/fix for newer automake sed -iautomake -e 's|automake\*1\.10\*|automake*1.1[0-5]*|' admin/cvs.sh +diff -u admin/cvs.sh.automake admin/cvs.sh make -f admin/Makefile.common cvs From 496bfe539d6f51f35089a7116676e963e4d84b1b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Jun 2012 01:14:59 +0200 Subject: [PATCH 5/6] fix the sed suffix to match the diff line --- kdelibs3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdelibs3.spec b/kdelibs3.spec index 4b0eadf..018b9fb 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -270,7 +270,7 @@ format for easy browsing sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h # hack/fix for newer automake -sed -iautomake -e 's|automake\*1\.10\*|automake*1.1[0-5]*|' admin/cvs.sh +sed -i.automake -e 's|automake\*1\.10\*|automake*1.1[0-5]*|' admin/cvs.sh diff -u admin/cvs.sh.automake admin/cvs.sh make -f admin/Makefile.common cvs From b8199a3fbdd255bb6ed17fb2dbf1f7698b03f32b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Jun 2012 01:32:07 +0200 Subject: [PATCH 6/6] remove flawed and obsolete automake version check in admin/cvs.sh It turns out that the problem was that Rawhide has automake 1.11.5, which happens to match "automake*1.5*", which is checked before the valid versions. So we just remove the flawed version checks entirely. Nobody is using an automake older than 1.6.1 anymore anyway. --- kdelibs-3.5.10-automake-version.patch | 17 +++++++++++++++++ kdelibs3.spec | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 kdelibs-3.5.10-automake-version.patch diff --git a/kdelibs-3.5.10-automake-version.patch b/kdelibs-3.5.10-automake-version.patch new file mode 100644 index 0000000..6ee4e6d --- /dev/null +++ b/kdelibs-3.5.10-automake-version.patch @@ -0,0 +1,17 @@ +diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh +--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 22:28:39.000000000 +0200 ++++ kdelibs-3.5.10-automake-version/admin/cvs.sh 2012-06-12 01:24:13.000000000 +0200 +@@ -63,12 +63,7 @@ + AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1` + required_automake_version="1.6.1 or newer" + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; diff --git a/kdelibs3.spec b/kdelibs3.spec index 018b9fb..574b1a1 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -73,6 +73,8 @@ Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch # fix FTBFS (cups-util.c must include stdio.h, #714133) Patch57: kdelibs-3.5.10-cups-util-missing-header.patch +# remove flawed and obsolete automake version check in admin/cvs.sh +Patch58: kdelibs-3.5.10-automake-version.patch # use /etc/kde in addition to /usr/share/config, borrowed from debian Patch100: kdelibs-3.5.5-kstandarddirs.patch @@ -244,6 +246,7 @@ format for easy browsing %patch55 -p1 -b .latex-syntax %patch56 -p1 -b .qcolor_gcc_ftbfs %patch57 -p1 -b .cups-util +%patch58 -p1 -b .automake-version %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext @@ -269,9 +272,6 @@ format for easy browsing sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h -# hack/fix for newer automake -sed -i.automake -e 's|automake\*1\.10\*|automake*1.1[0-5]*|' admin/cvs.sh -diff -u admin/cvs.sh.automake admin/cvs.sh make -f admin/Makefile.common cvs @@ -592,7 +592,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog * Mon Jun 11 2012 Kevin Kofler - 3.5.10-37 - rebuild for fixed GCC (#830618) -- fix sed syntax in the automake version hack +- remove flawed and obsolete automake version check in admin/cvs.sh * Tue May 08 2012 Rex Dieter 3.5.10-36 - rebuild (libtiff)