rpms/kdegraphics-extras/devel kdegraphics-extras.spec,1.5,1.6

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdegraphics-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4853

Modified Files:
	kdegraphics-extras.spec 
Log Message:
* Sun Sep 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.4-4
- -extras: fc6 respin for new(er) OpenEXR



Index: kdegraphics-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegraphics-extras/devel/kdegraphics-extras.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdegraphics-extras.spec	4 Sep 2006 21:39:20 -0000	1.5
+++ kdegraphics-extras.spec	11 Sep 2006 02:27:18 -0000	1.6
@@ -21,7 +21,7 @@
 %endif
 
 Version: 3.5.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group:	 Applications/Multimedia
@@ -98,11 +98,8 @@
 %endif
 
 %if "%{?extras}" == "1"
-%if "%{?fedora}" > "5"
-%else
 # -extras split occured at 3.5.3-3
 Conflicts: kdegraphics < 7:3.5.3-3
-%endif
 %define kpovmodeler 1
 %if "%{?kpovmodeler:1}" == "1"
 BuildRequires: freeglut-devel
@@ -163,6 +160,7 @@
 %if "%{?extras}" == "1"
 make %{?_smp_mflags} -C kfile-plugins/exr
 make %{?_smp_mflags} -C kuickshow
+%{?kpovmodeler:make %{?_smp_mflags} -C kpovmodeler}
 %endif
 
 
@@ -179,6 +177,7 @@
 %if "%{?extras}" == "1"
 make install DESTDIR=$RPM_BUILD_ROOT -C kfile-plugins/exr
 make install DESTDIR=$RPM_BUILD_ROOT -C kuickshow
+%{?kpovmodeler:make install DESTDIR=$RPM_BUILD_ROOT -C kpovmodeler}
 %endif
 
 # FIXME/TODO: get dfi to shut-the-hell-up about KDE's use of Keywords= and
@@ -268,11 +267,19 @@
 %post
 touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%if "%{?kpovmodeler:1}" == "1"
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+%endif
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%if "%{?kpovmodeler:1}" == "1"
+touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
+%endif
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
@@ -287,6 +294,13 @@
 %{_datadir}/services/kfile_exr.desktop
 %{_libdir}/libkdeinit_*.*
 %{_libdir}/kde3/*.[ls][ao]
+%if "%{?kpovmodeler:1}" == "1"
+%{_bindir}/kpovmodeler
+%{_libdir}/libkpovmodeler.so.0.0.0
+%{_datadir}/applications/kde/*kpovmodeler.desktop
+%{_datadir}/apps/kpovmodeler
+%{_datadir}/icons/crystalsvg/*/*/*
+%endif
 %endif
 
 
@@ -295,8 +309,14 @@
 
 
 %changelog
+* Sun Sep 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.4-4
+- -extras: fc6 respin for new(er) OpenEXR
+
+* Tue Sep 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.4-3
+- -extras: *really* (re)enable kpovmodeler
+
 * Mon Sep 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.4-2
-- (re)enable kpovmodeler
+- -extras: (re)enable kpovmodeler
 
 * Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.4-1
 - kde-3.5.4