diff --git a/kdegraphics.spec b/kdegraphics.spec index 44da75b..0c43d10 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -22,7 +22,7 @@ Name: kdegraphics 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 @@ Patch3: kdegraphics-3.5.1-warning.patch 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 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %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 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %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 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %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 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %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