rpms/dx/EL-4 dx.spec, 1.7, 1.8 dx-gcc43.patch, 1.7, NONE dx-open.patch, 1.1, NONE

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/dx/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17182

Modified Files:
	dx.spec 
Removed Files:
	dx-gcc43.patch dx-open.patch 
Log Message:
sync with EL-5


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/EL-4/dx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dx.spec	7 Jan 2008 18:18:49 -0000	1.7
+++ dx.spec	8 Feb 2008 19:02:55 -0000	1.8
@@ -1,15 +1,13 @@
 Summary: Open source version of IBM's Visualization Data Explorer 
 Name: dx
 Version: 4.4.4
-Release: 5%{?dist}
+Release: 3%{?dist}
 URL: http://www.opendx.org/
 Group: Applications/Engineering
 Source0: http://opendx.npaci.edu/source/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0: %{name}-rpm.patch
-Patch1: %{name}-open.patch
-Patch2: %{name}-gcc43.patch
-License: IBM
+License: IBM Public License
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
 BuildRequires: desktop-file-utils
@@ -18,7 +16,7 @@
 BuildRequires: ImageMagick-devel
 #FIXME doesn't build currently
 #BuildRequires: java-devel
-BuildRequires: lesstif-devel
+BuildRequires: openmotif-devel
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: libtool
@@ -35,18 +33,10 @@
 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-5
-
-%description libs
-This package contains the shared libraries from OpenDX.
-
 %package devel
 Summary: OpenDX module development headers and libraries
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 If you want to write a module to use in the Data Explorer Visual Program
@@ -55,8 +45,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .r
-%patch1 -p1 -b .open
-%patch2 -p1 -b .gcc43
 # fix debuginfo rpmlint warnings
 chmod a-x src/exec/{dxmods,dpexec,hwrender}/*.{c,h}
 
@@ -86,6 +74,7 @@
 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
@@ -96,24 +85,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun libs -p /sbin/ldconfig
+%postun -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
@@ -121,21 +107,11 @@
 %{_libdir}/lib*.so
 
 %changelog
-* Mon Jan 07 2008 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-5
-- fix build with gcc-4.3
-- drop X-Fedora from desktop file (per current packaging guidelines)
-- move shared libraries to a subpackage to avoid multilib conflicts
-  (bug #341041)
-
-* Fri Aug 17 2007 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-4
-- fix open() invocation with O_CREAT and no mode
-- update License: in accordance with latest guidelines
-
 * Wed Jul 04 2007 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-3
-- rebuild against new netcdf shared libs
 - fix menu icon transparency (#207841)
 - drop redundant BRs
 - fix some rpmlint warnings
+- build against openmotif for EL-4/5
 
 * Wed Sep 27 2006 Dominik Mierzejewski <rpm at greysector.net> 4.4.4-2
 - rebuild against lesstif


--- dx-gcc43.patch DELETED ---


--- dx-open.patch DELETED ---