SPECS (K3B_0_12): k3b.spec - drop linux22 bcond

arekm arekm at pld-linux.org
Sat Dec 23 22:43:18 CET 2006


Author: arekm                        Date: Sat Dec 23 21:43:18 2006 GMT
Module: SPECS                         Tag: K3B_0_12
---- Log message:
- drop linux22 bcond

---- Files affected:
SPECS:
   k3b.spec (1.138.2.1 -> 1.138.2.2) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.138.2.1 SPECS/k3b.spec:1.138.2.2
--- SPECS/k3b.spec:1.138.2.1	Sat Dec 23 22:26:08 2006
+++ SPECS/k3b.spec	Sat Dec 23 22:43:13 2006
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	linux22		# building on kernel 2.2.x
 %bcond_with	reqs		# force optional Requires
 %bcond_without	hal		# build without hal support
 %bcond_without	resmgr		# build without ResMgr support
@@ -19,12 +18,11 @@
 # Source0-md5:	e7d423fe386fe0cab7aec6034eb33316
 Source1:	http://dl.sourceforge.net/k3b/%{name}-i18n-%{version}.tar.bz2
 # Source1-md5:	f9de0fb3ce91fa572f4f0fd24dcfe2f2
-Patch0:		%{name}-linux22.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-group.patch
-Patch3:		kde-ac260.patch
-Patch4:		kde-ac260-lt.patch
-Patch5:		kde-am.patch
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-group.patch
+Patch2:		kde-ac260.patch
+Patch3:		kde-ac260-lt.patch
+Patch4:		kde-am.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -293,12 +291,11 @@
 
 %prep
 %setup -q -a1
-%{?with_linux22:%patch0 -p1}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -471,6 +468,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138.2.2  2006/12/23 21:43:13  arekm
+- drop linux22 bcond
+
 Revision 1.138.2.1  2006/12/23 21:26:08  arekm
 - rel 3; stable for th
 
================================================================

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



More information about the pld-cvs-commit mailing list