rpms/dx/EL-5 dx.spec,1.5,1.6

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/dx/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12303

Modified Files:
	dx.spec 
Log Message:
* Tue Feb 17 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-4
- drop X-Fedora from desktop file (per current packaging guidelines)
- move shared libraries to a subpackage to avoid multilib conflicts
  (bug #341041)



Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/EL-5/dx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dx.spec	4 Jul 2007 22:03:40 -0000	1.5
+++ dx.spec	17 Feb 2009 00:06:44 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Open source version of IBM's Visualization Data Explorer 
 Name: dx
 Version: 4.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
@@ -33,10 +33,18 @@
 sophisticated data model provides users with great flexibility in creating
 visualizations.
 
+%package libs
+Summary: OpenDX shared libraries
+Group: System Environment/Libraries
+Obsoletes: %{name} < 4.4.4-4
+
+%description libs
+This package contains the shared libraries from OpenDX.
+
 %package devel
 Summary: OpenDX module development headers and libraries
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 If you want to write a module to use in the Data Explorer Visual Program
@@ -74,7 +82,6 @@
 sed -e 's/"R. c #b4b4b4",/"R. c none",/' src/uipp/ui/icon50.xpm > $RPM_BUILD_ROOT%{_datadir}/pixmaps/dx.xpm
 desktop-file-install --vendor fedora \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	--add-category X-Fedora \
 	%{SOURCE1}
 
 # cleanup buildroot
@@ -85,21 +92,24 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,755)
 %doc AUTHORS ChangeLog LICENSE NEWS doc/README*
 %{_bindir}/*
-%{_libdir}/lib*.so.*
 %{_libdir}/dx
 %{_datadir}/dx
 %{_mandir}/*/*
 %{_datadir}/pixmaps/*.xpm
 %{_datadir}/applications/*.desktop
 
+%files libs
+%defattr(644,root,root,755)
+%{_libdir}/lib*.so.*
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/dx
@@ -107,6 +117,11 @@
 %{_libdir}/lib*.so
 
 %changelog
+* Tue Feb 17 2009 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-4
+- drop X-Fedora from desktop file (per current packaging guidelines)
+- move shared libraries to a subpackage to avoid multilib conflicts
+  (bug #341041)
+
 * Wed Jul 04 2007 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-3
 - fix menu icon transparency (#207841)
 - drop redundant BRs