rpms/kdepim/devel kdepim.spec, 1.131.4.1, 1.131.4.2 kdepim-3.5.7-kde#140549.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20123

Modified Files:
      Tag: kdepim-enterprise-branch
	kdepim.spec 
Removed Files:
      Tag: kdepim-enterprise-branch
	kdepim-3.5.7-kde#140549.patch 
Log Message:
omit upstreamed patch
fix %%debug macro usage



Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.131.4.1
retrieving revision 1.131.4.2
diff -u -r1.131.4.1 -r1.131.4.2
--- kdepim.spec	20 Sep 2007 18:10:00 -0000	1.131.4.1
+++ kdepim.spec	21 Sep 2007 12:52:01 -0000	1.131.4.2
@@ -38,8 +38,6 @@
 Patch2: kdepim-3.4.0-s390.patch
 Patch3: kdepim-3.4.0-kandy-icons.patch
 Patch4: kdepim-3.4.92-libz.patch
-#upstream
-Patch140549: kdepim-3.5.7-kde#140549.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -120,15 +118,15 @@
 %setup -q %{?ent_date: -n %{name}}
 
 %ifarch s390 s390x
+# FIXME: use KDE_NO_COMPILE=kpilot and/or --without-pilot-link  -- Rex
 %patch2 -p1 -b .s390
 rm -rf kpilot
 %endif
 
 install -m644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} kandy/src/
 %patch3 -p1 -b .kandy-icons
-%patch4 -p1 -b .libz
 
-%patch140549 -p1 -b .kde#140549
+#patch4 -p1 -b .libz
 
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
@@ -143,7 +141,7 @@
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-   %{?debug:--disable-debug --disable-warnings} \
+   %{!?debug:--disable-debug --disable-warnings} \
    %{?final: --enable-final} \
    --includedir=%{_includedir}/kde \
    --with-gpg=%{_bindir}/gpg \


--- kdepim-3.5.7-kde#140549.patch DELETED ---