SPECS: k3b.spec - fix compile (-optiontab.patch) - STBR

charles charles at pld-linux.org
Wed Sep 14 12:59:26 CEST 2005


Author: charles                      Date: Wed Sep 14 10:59:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix compile (-optiontab.patch)
- STBR

---- Files affected:
SPECS:
   k3b.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.109 SPECS/k3b.spec:1.110
--- SPECS/k3b.spec:1.109	Sat Sep 10 16:55:02 2005
+++ SPECS/k3b.spec	Wed Sep 14 12:59:21 2005
@@ -16,12 +16,12 @@
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
 # Source0-md5:	816bbf45eaa3bbcccbedc80cf0d25b42
-#Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
-Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-0.12.4.tar.bz2
-# Source1-md5:	ffdc697fb1e3518f1af900425230612b
+Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
+# Source1-md5:	17744598d50deabe5edf3f9fc9e0af89
 Patch0:		%{name}-linux22.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-group.patch
+Patch3:		%{name}-optiontab.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -276,6 +276,7 @@
 %{?with_linux22:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -289,8 +290,7 @@
 
 %{__make}
 
-#cd %{name}-i18n-%{version}
-cd %{name}-i18n-0.12.4
+cd %{name}-i18n-%{version}
 cp -f /usr/share/automake/config.sub admin
 %{__make} -f admin/Makefile.common
 %configure
@@ -305,8 +305,7 @@
 	k3bsetup2dir=%{_desktopdir}/kde \
 	kde_htmldir=%{_kdedocdir}
 
-#%{__make} install -C %{name}-i18n-%{version} \
-%{__make} install -C %{name}-i18n-0.12.4 \
+%{__make} install -C %{name}-i18n-%{version} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
@@ -439,6 +438,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2005/09/14 10:59:21  charles
+- fix compile (-optiontab.patch)
+- STBR
+
 Revision 1.109  2005/09/10 14:55:02  wolf
 - 0.12.4a
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/k3b.spec?r1=1.109&r2=1.110&f=u




More information about the pld-cvs-commit mailing list