rpms/geomview/devel geomview.spec,1.47,1.48

Rex Dieter rdieter at fedoraproject.org
Mon Jul 27 14:39:29 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/geomview/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6440

Modified Files:
	geomview.spec 
Log Message:
* Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.4-11
- drop kde3/mimelnk bits where kde4 is used (F-9+, RHEL6+)
- make -libs unconditional
- optimize scriptlets
- nuke rpaths



Index: geomview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- geomview.spec	24 Jul 2009 23:52:36 -0000	1.47
+++ geomview.spec	27 Jul 2009 14:39:29 -0000	1.48
@@ -1,13 +1,14 @@
 
-%if 0%{?fedora} > 8
-# make -libs subpkg
-%define libs 1
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%define kde4 1
+%else
+%define kde3 1
 %endif
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -61,21 +62,14 @@ BuildRequires: tetex
 %endif
 
 # for %_datadir/mimelnk
-%if 0%{?fedora} > 6
+%if 0%{?kde3} && 0%{?fedora} > 6
 Requires: kde-filesystem
 %endif
 Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and
@@ -85,24 +79,19 @@ engine for other programs which produce 
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-# include to paranoid, installing libs-only is still mostly untested
 Requires: %{name} = %{version}-%{release}
-# hack to help multilib upgrades (temporary)
-Obsoletes: %{name} < %{version}-%{release}
-# split happened here
-#Obsoletes: geomview < 1.9.4-7 
+# hack to help multilib upgrades
+Obsoletes: geomview < 1.9.4-11
 %description libs
 %{summary}.
-%endif
 
 %package devel
 Summary: Development files for %{name} 
 Group:   Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -110,6 +99,9 @@ Requires: %{name}-libs = %{version}-%{re
 %prep
 %setup -q 
 
+# rpath hack
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+
 
 %build
 %configure \
@@ -134,8 +126,10 @@ desktop-file-install --vendor="fedora" \
 # mime
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
 
-# mimelnk (kde3)
+%if 0%{?kde3}
+# mimelnk 
 install -p -m644 -D %{SOURCE11} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
+%endif
 
 # app icons
 install -p -m644 -D %{SOURCE20} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/geomview.png
@@ -157,12 +151,8 @@ rm -rf %{buildroot}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
-update-desktop-database -q > /dev/null 2>&1 ||:
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -170,17 +160,21 @@ if [ $1 -eq 0 ] ;then
 fi
 
 %postun
-%{!?libs:/sbin/ldconfig}
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
 update-desktop-database -a > /dev/null 2>&1 ||:
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
+fi
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
+update-desktop-database -a > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 
 %files
@@ -191,7 +185,9 @@ update-mime-database %{_datadir}/mime > 
 %{_datadir}/applications/*.desktop
 %{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
+%if 0%{?kde3}
 %{_datadir}/mimelnk/*
+%endif
 %{_datadir}/mime/packages/*.xml
 %{_infodir}/*
 %{_mandir}/man1/*
@@ -212,6 +208,12 @@ update-mime-database %{_datadir}/mime > 
 
 
 %changelog
+* Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.4-11
+- drop kde3/mimelnk bits where kde4 is used (F-9+, RHEL6+)
+- make -libs unconditional
+- optimize scriptlets
+- nuke rpaths
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list