SPECS: openmotif.spec - added no-Xaw patch, removed outdated gcc34...

[qboosh]

Author: qboosh                       Date: Sat Feb 18 18:33:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added no-Xaw patch, removed outdated gcc34 patch, cleanups

---- Files affected:
SPECS:
   openmotif.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/openmotif.spec
diff -u SPECS/openmotif.spec:1.67 SPECS/openmotif.spec:1.68
--- SPECS/openmotif.spec:1.67	Sun Feb 12 16:29:50 2006
+++ SPECS/openmotif.spec	Sat Feb 18 19:33:25 2006
@@ -22,15 +22,16 @@
 Patch0:		%{name}-makedepend.patch
 Patch1:		%{name}-am-uil.patch
 Patch2:		%{name}-mwmrc.patch
-Patch3:		%{name}-gcc34.patch
-Patch4:		%{name}-bison.patch
-Patch5:		%{name}-CVE-2005-3964.patch
+Patch3:		%{name}-bison.patch
+Patch4:		%{name}-CVE-2005-3964.patch
+Patch5:		%{name}-no-Xaw.patch
 URL:		http://www.openmotif.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libtool
+BuildRequires:	xorg-data-xbitmaps
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXp-devel
 Requires:	%{name}-libs = %{version}-%{release}
@@ -140,32 +141,40 @@
 mwmrc oraz zasoby Mwm.
 
 %package compat
-Summary:	OpenMotif compat libraries
-Summary(pl):	Biblioteki kompatybilności dla OpenMotif
+Summary:	Fake OpenMotif compat libraries
+Summary(pl):	Dowiązania udające biblioteki kompatybilności OpenMotif
 Group:		Libraries
-Requires:	libXm.so.3.0.2
+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
-OpenMotif compat libraries
+Fake OpenMotif compat libraries (symlinks to current libXm library,
+_some_ old programs may work with them).
 
 %description compat -l pl
-Biblioteki kompatybilności dla OpenMotif
+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
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
-#%{__autoheader}
+#%{__autoheader} -- disabled, missing templates
 %{__automake}
 %{__autoconf}
 
@@ -176,9 +185,6 @@
 %{__make} clean
 %{__make}
 
-# workaround - don't let rebuild onHelp with wrong options during %%install
-#touch demos/lib/Xmd/onHelp.o demos/lib/Xmd/onHelp
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_examplesdir}/motif,%{_datadir}/xsessions} \
@@ -286,6 +292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2006/02/18 18:33:25  qboosh
+- added no-Xaw patch, removed outdated gcc34 patch, cleanups
+
 Revision 1.67  2006/02/12 15:29:50  pluto
 - release 5.
 
================================================================

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