jreznik pushed to kdelibs3 (epel7). "- FTBFS kdelibs3-3.5.10-11.fc11 (#511571) (..more)"

[notifications at fedoraproject.org]

>From 711cd635b527a9f28bd2b07b1e529de3191da3e0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun, 19 Jul 2009 00:40:12 +0000
Subject: - FTBFS kdelibs3-3.5.10-11.fc11 (#511571) - -devel: Requires:
 %{name}%_isa ...


diff --git a/kdelibs3.spec b/kdelibs3.spec
index 9ea060b..4488d6c 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -208,7 +208,7 @@ Provides:  kdelibs3-devel = %{version}-%{release}
 Obsoletes: kdelibs-devel < 6:%{version}-%{release}
 Provides:  kdelibs-devel = 6:%{version}-%{release}
 %endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: %{qt3}-devel
 Requires: openssl-devel
 %{?arts:Requires: arts-devel}
@@ -278,7 +278,9 @@ format for easy browsing
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %if %{make_cvs}
-   make -f admin/Makefile.common cvs
+# hack/fix for newer automake
+  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
+  make -f admin/Makefile.common cvs
 %endif
 
 
@@ -623,6 +625,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %changelog
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-12 
+- FTBFS kdelibs3-3.5.10-11.fc11 (#511571)
+- -devel: Requires: %%{name}%%_isa ...
+
 * Sun Apr 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.5.10-11
 - update openssl patch (for 0.9.8k)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=711cd635b527a9f28bd2b07b1e529de3191da3e0