rpms/dx/devel dx-gcc43.patch,NONE,1.1 dx.spec,1.5,1.6

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/dx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15951

Modified Files:
	dx.spec 
Added Files:
	dx-gcc43.patch 
Log Message:
- 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)


dx-gcc43.patch:

--- NEW FILE dx-gcc43.patch ---
diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43	2006-01-03 01:12:34.000000000 +0100
+++ dx-4.4.4/src/uipp/widgets/MultiText.h	2008-01-07 19:06:27.000000000 +0100
@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
 #define XmNsmoothScroll		"smoothScroll"
 #define XmNwaitCursorCount	"waitCursorCount"
 
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 #define XmNmarginHeight		"marginHeight"
 #define XmNmarginWidth		"marginWidth"
 #define XmNwordWrap		"wordWrap"
@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
 #define XmCSmoothScroll		"SmoothScroll"
 #define XmCWaitCursorCount	"WaitCursorCount"
 
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
 #define XmCMarginHeight		"MarginHeight"
 #define XmCMarginWidth		"MarginWidth"
 #define XmCWordWrap		"WordWrap"


Index: dx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dx/devel/dx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dx.spec	17 Aug 2007 23:59:32 -0000	1.5
+++ dx.spec	7 Jan 2008 18:14:39 -0000	1.6
@@ -1,13 +1,14 @@
 Summary: Open source version of IBM's Visualization Data Explorer 
 Name: dx
 Version: 4.4.4
-Release: 4%{?dist}
+Release: 5%{?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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison
@@ -34,10 +35,17 @@
 sophisticated data model provides users with great flexibility in creating
 visualizations.
 
+%package libs
+Summary: OpenDX shared libraries
+Group: System Environment/Libraries
+
+%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
@@ -47,6 +55,7 @@
 %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}
 
@@ -76,7 +85,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
@@ -87,21 +95,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
@@ -109,6 +120,12 @@
 %{_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