SPECS (AC-branch): openmotif.spec - merge -compat package from HEA...

[glen]

Author: glen                         Date: Mon Jul 17 18:55:44 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge -compat package from HEAD
- CVE-2005-3964 (buffer overflows in libUil)
- rel 6

---- Files affected:
SPECS:
   openmotif.spec (1.59 -> 1.59.2.1) 

---- Diffs:

================================================================
Index: SPECS/openmotif.spec
diff -u SPECS/openmotif.spec:1.59 SPECS/openmotif.spec:1.59.2.1
--- SPECS/openmotif.spec:1.59	Sat Aug  7 21:32:08 2004
+++ SPECS/openmotif.spec	Mon Jul 17 20:55:39 2006
@@ -9,7 +9,7 @@
 Summary(pl):	OpenMotif
 Name:		openmotif
 Version:	2.2.3
-Release:	3
+Release:	6
 License:	Open Group Public License
 Group:		X11/Libraries
 Source0:	http://ftp.ics.com/pub/Products/Motif/om%{version}/src/openMotif-%{version}.tar.gz
@@ -24,6 +24,7 @@
 Patch2:		%{name}-mwmrc.patch
 Patch3:		%{name}-gcc34.patch
 Patch4:		%{name}-bison.patch
+Patch5:		%{name}-CVE-2005-3964.patch
 URL:		http://www.openmotif.org/
 BuildRequires:	XFree86
 BuildRequires:	XFree86-devel
@@ -137,6 +138,28 @@
 Wersja BETA mwm. Pochodzi z fvwm, ma nowy parser rozumiejący składnię
 mwmrc oraz zasoby Mwm.
 
+%package compat
+Summary:	Fake OpenMotif compat libraries
+Summary(pl):	Dowiązania udające biblioteki kompatybilności OpenMotif
+Group:		Libraries
+Requires:	%{_libdir}/libXm.so.3.0.2
+%ifarch %{x8664} ia64 ppc64 s390x sparc64
+Provides:	libXm.so.1()(64bit)
+Provides:	libXm.so.2()(64bit)
+%else
+Provides:	libXm.so.1
+Provides:	libXm.so.2
+%endif
+
+%description compat
+Fake OpenMotif compat libraries (symlinks to current libXm library,
+_some_ old programs may work with them).
+
+%description compat -l pl
+Dowiązania udające biblioteki kompatybilności OpenMotif (dowiązania
+symboliczne do nowej wersji biblioteki libXm, _niektóre_ stare
+programy mogą z nimi działać).
+
 %prep
 %setup -q -n openMotif-%{version}
 %patch0 -p1
@@ -144,6 +167,7 @@
 %patch2 -p1
 #%patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -157,7 +181,8 @@
 	--enable-static
 
 %{__make} clean
-%{__make}
+# workaround: fails with multiple jobservers
+%{__make} -j1
 
 # workaround - don't let rebuild onHelp with wrong options during %%install
 #touch demos/lib/Xmd/onHelp.o demos/lib/Xmd/onHelp
@@ -183,6 +208,9 @@
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/mwm.desktop
 install %{SOURCE6} $RPM_BUILD_ROOT%{_aclocaldir}
 
+ln -sf libXm.so.3.0.2 $RPM_BUILD_ROOT%{_libdir}/libXm.so.2
+ln -sf libXm.so.3.0.2 $RPM_BUILD_ROOT%{_libdir}/libXm.so.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -255,12 +283,22 @@
 %{_mandir}/man1/mwm.1*
 %{_mandir}/man4/*
 
+%files compat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXm.so.1
+%attr(755,root,root) %{_libdir}/libXm.so.2
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59.2.1  2006/07/17 18:55:39  glen
+- merge -compat package from HEAD
+- CVE-2005-3964 (buffer overflows in libUil)
+- rel 6
+
 Revision 1.59  2004/08/07 19:32:08  havner
 - rel 3 for R:xinitrc-ng
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openmotif.spec?r1=1.59&r2=1.59.2.1&f=u