rpms/kdegraphics/F-8 kdegraphics.spec,1.118,1.119

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Mar 10 15:30:15 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16184

Modified Files:
	kdegraphics.spec 
Log Message:
rhel-related fixes



Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-8/kdegraphics.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- kdegraphics.spec	16 Feb 2008 03:25:32 -0000	1.118
+++ kdegraphics.spec	10 Mar 2008 15:29:40 -0000	1.119
@@ -22,7 +22,7 @@
 Summary: K Desktop Environment - Graphics Applications
 Epoch:   7
 Version: 3.5.9
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: GPLv2
 Group:   Applications/Multimedia
@@ -37,7 +37,9 @@
 Provides: kdegraphics3 = %{version}-%{release}
 
 Requires: ghostscript
+%if 0%{?fedora}
 Requires: gocr
+%endif
 
 %if 0%{?libs}
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -148,14 +150,6 @@
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc-warning
 
-
-%if ! 0%{?extras}
-  DO_NOT_COMPILE=""
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
-  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -164,6 +158,13 @@
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
+%if ! 0%{?extras}
+  DO_NOT_COMPILE=""
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfax"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kfaxview"
+  export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
+%endif
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
@@ -352,10 +353,12 @@
 %if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
+%if 0%{?extras}
 %exclude %{_libdir}/libkfaximage.la
 %exclude %{_libdir}/libkpovmodeler.la
 %exclude %{_libdir}/libkpovmodeler.so.*
 %endif
+%endif
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.la
 
@@ -363,9 +366,11 @@
 %defattr(-,root,root,-)
 %{_includedir}/kde/*
 %{_libdir}/lib*.so
+%if 0%{?extras}
 #exclude %{_libdir}/libkpovmodeler.so
 %exclude %{_libdir}/libkfaximage.so
 %exclude %{_libdir}/libkdeinit_*.so
+%endif
 
 
 %changelog




More information about the fedora-extras-commits mailing list