rpms/kdelibs3/devel kdelibs3.spec,1.61,1.62

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6415

Modified Files:
	kdelibs3.spec 
Log Message:
* 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 ...



Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- kdelibs3.spec	19 Apr 2009 21:37:04 -0000	1.61
+++ kdelibs3.spec	19 Jul 2009 00:40:12 -0000	1.62
@@ -208,7 +208,7 @@ Provides:  kdelibs3-devel = %{version}-%
 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/crys
 
 
 %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)