rpms/kdebase3/devel kdebase3.spec,1.83,1.84

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdebase3.spec 
Log Message:
* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-11
- FTBFS kdebase3-3.5.10-8.fc11 (#511656)
- Requires: %name-libs%?_isa ...



Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- kdebase3.spec	22 Apr 2009 10:53:36 -0000	1.83
+++ kdebase3.spec	19 Jul 2009 01:00:32 -0000	1.84
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 10%{?dist}.1
+Release: 11%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -93,7 +93,7 @@ Patch100: kdebase-3.5.10-minicli-decimal
 # security fixes
 
 %if 0%{?libs}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %else
 Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -233,7 +233,7 @@ Provides: kdebase3-devel = %{version}-%{
 Provides: kdebase-devel = 6:%{version}-%{release}
 Obsoletes: kdebase-devel < 6:%{version}-%{release}
 %endif
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs3-devel
 Group: Development/Libraries
 %description devel
@@ -347,9 +347,12 @@ sed -i.omit -e 's|^FONTINST_SUBDIR=kfont
 install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
 
 %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
 
+
 %build
 # set some default enviroments
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -878,6 +881,10 @@ fi
 
 
 %changelog
+* Sat Jul 18 2009 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-11
+- FTBFS kdebase3-3.5.10-8.fc11 (#511656)
+- Requires: %%name-libs%%?_isa ...
+
 * Wed Apr 22 2009 Karsten Hopp <karsten at redhat.com> 3.5.10-10.1
 - disable firewire stuff on s390(x)