packages: kde4-kdelibs/kde4-kdelibs.spec - remove fix bla patch4 - apply br...

[shadzik]

Author: shadzik                      Date: Wed Oct 13 12:44:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove fix bla patch4
- apply branch.diff

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs.spec (1.216 -> 1.217) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.216 packages/kde4-kdelibs/kde4-kdelibs.spec:1.217
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.216	Wed Oct 13 14:27:27 2010
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Wed Oct 13 14:44:29 2010
@@ -27,7 +27,6 @@
 Patch1:		%{name}-cacert.patch
 Patch2:		%{name}-findlzmafix.patch
 Patch3:		%{name}-aboutPLD.patch
-Patch4:		%{name}-fix_https_links.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -221,12 +220,11 @@
 
 %prep
 %setup -q -n %{orgname}-%{version}
-#%patch100 -p0
+%patch100 -p0
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
-%patch4 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
@@ -1095,6 +1093,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.217  2010/10/13 12:44:29  shadzik
+- remove fix bla patch4
+- apply branch.diff
+
 Revision 1.216  2010/10/13 12:27:27  arvenil
 - added *-fix_https_links.patch
 - BR: docbook-dtd42-xml
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.216&r2=1.217&f=u