SPECS: openmotif.spec - updated bison patch, killed byacc thinko -...

[qboosh]

Author: qboosh                       Date: Tue Nov 27 18:59:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated bison patch, killed byacc thinko
- added parbuild patch
- pass proper fontconfig-config
- updated "compat" symlinks

---- Files affected:
SPECS:
   openmotif.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/openmotif.spec
diff -u SPECS/openmotif.spec:1.75 SPECS/openmotif.spec:1.76
--- SPECS/openmotif.spec:1.75	Tue Nov 27 16:54:49 2007
+++ SPECS/openmotif.spec	Tue Nov 27 19:59:15 2007
@@ -23,11 +23,11 @@
 Patch1:		%{name}-mwmrc.patch
 Patch2:		%{name}-bison.patch
 Patch3:		%{name}-freetype.patch
+Patch4:		%{name}-parbuild.patch
 URL:		http://www.openmotif.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	byacc
 BuildRequires:	flex
 BuildRequires:	freetype-devel
 BuildRequires:	libtool
@@ -39,7 +39,7 @@
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXp-devel
 Requires:	%{name}-libs = %{version}-%{release}
-Provides:	motif = 2.2
+Provides:	motif = 2.3
 # Not restricted, lesstif provided library version 1.2
 # OpenMotif provide library version 2.1
 #Obsoletes:	lesstif
@@ -73,6 +73,18 @@
 %description clients -l pl.UTF-8
 uil i xmbind.
 
+%package libs
+Summary:	OpenMotif shared libraries
+Summary(pl.UTF-8):	Biblioteki współdzielone OpenMotif
+Group:		Libraries
+Conflicts:	openmotif < 2.2.3-0.3
+
+%description libs
+OpenMotif shared libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone OpenMotif.
+
 %package devel
 Summary:	OpenMotif devel
 Summary(pl.UTF-8):	Pliki nagłówkowe OpenMotif
@@ -80,7 +92,7 @@
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	xorg-lib-libXmu-devel
 Requires:	xorg-lib-libXp-devel
-Provides:	motif-devel = 2.1
+Provides:	motif-devel = 2.3
 Obsoletes:	lesstif-devel
 
 %description devel
@@ -94,7 +106,7 @@
 Summary(pl.UTF-8):	Statyczne biblioteki OpenMotif
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Provides:	motif-static
+Provides:	motif-static = 2.3
 Obsoletes:	lesstif-static
 
 %description static
@@ -115,18 +127,6 @@
 %description demos -l pl.UTF-8
 Programy demonstracyjne do OpenMotif.
 
-%package libs
-Summary:	OpenMotif shared libraries
-Summary(pl.UTF-8):	Biblioteki współdzielone OpenMotif
-Group:		Libraries
-Conflicts:	openmotif < 2.2.3-0.3
-
-%description libs
-OpenMotif shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone OpenMotif.
-
 %package mwm
 Summary:	Motif window manager
 Summary(pl.UTF-8):	Motifowy zarządca okien
@@ -147,13 +147,15 @@
 Summary:	Fake OpenMotif compat libraries
 Summary(pl.UTF-8):	Dowiązania udające biblioteki kompatybilności OpenMotif
 Group:		Libraries
-Requires:	%{_libdir}/libXm.so.3.0.2
+Requires:	%{_libdir}/libXm.so.4.0.0
 %ifarch %{x8664} ia64 ppc64 s390x sparc64
 Provides:	libXm.so.1()(64bit)
 Provides:	libXm.so.2()(64bit)
+Provides:	libXm.so.3()(64bit)
 %else
 Provides:	libXm.so.1
 Provides:	libXm.so.2
+Provides:	libXm.so.3
 %endif
 
 %description compat
@@ -171,10 +173,11 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I ./
+%{__aclocal} -I .
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -186,7 +189,7 @@
 	--enable-xft \
 	--enable-jpeg \
 	--enable-png \
-	--with-fontconfig-config=freetype-config
+	--with-fontconfig-config="pkg-config fontconfig"
 
 %{__make} clean
 %{__make}
@@ -212,8 +215,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
+ln -sf libXm.so.4.0.0 $RPM_BUILD_ROOT%{_libdir}/libXm.so.3
+ln -sf libXm.so.4.0.0 $RPM_BUILD_ROOT%{_libdir}/libXm.so.2
+ln -sf libXm.so.4.0.0 $RPM_BUILD_ROOT%{_libdir}/libXm.so.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -234,20 +238,35 @@
 %{_mandir}/man1/uil.1*
 %{_mandir}/man1/xmbind.1*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libMrm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libMrm.so.4
+%attr(755,root,root) %{_libdir}/libUil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libUil.so.4
+%attr(755,root,root) %{_libdir}/libXm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libXm.so.4
+
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libMrm.so
+%attr(755,root,root) %{_libdir}/libUil.so
+%attr(755,root,root) %{_libdir}/libXm.so
+%{_libdir}/libMrm.la
+%{_libdir}/libUil.la
+%{_libdir}/libXm.la
 %{_includedir}/Mrm
 %{_includedir}/Xm
 %{_includedir}/uil
 %{_mandir}/man3/*
 %{_mandir}/man5/*
-%{_aclocaldir}/*.m4
+%{_aclocaldir}/ac_find_motif.m4
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libMrm.a
+%{_libdir}/libUil.a
+%{_libdir}/libXm.a
 
 %files demos
 %defattr(644,root,root,755)
@@ -273,10 +292,6 @@
 %attr(755,root,root) %{_bindir}/xmanimate
 %{_examplesdir}/motif
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-
 %files mwm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mwm
@@ -291,6 +306,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXm.so.1
 %attr(755,root,root) %{_libdir}/libXm.so.2
+%attr(755,root,root) %{_libdir}/libXm.so.3
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -298,6 +314,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2007-11-27 18:59:15  qboosh
+- updated bison patch, killed byacc thinko
+- added parbuild patch
+- pass proper fontconfig-config
+- updated "compat" symlinks
+
 Revision 1.75  2007-11-27 15:54:49  tommat
 - up to 2.3.0
 - removed outdated patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openmotif.spec?r1=1.75&r2=1.76&f=u