packages: openmotif/openmotif-parbuild.patch, openmotif/openmotif.spec, ope...

[gotar]

Author: gotar                        Date: Sun Jun 21 00:54:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upgraded to 2.3.2 (from pre-2.3.1! final release was 2.3.1-1);
- pass bindir for demos/programs (default ${prefix}/share/Xm since 2.3.1)
- libtool patch in sources since final 2.3.1 too,
- BR: libuuid-devel (libXm.la only), --enable-themes (currently: nothing),
- note on breaking short-circuit, cosmetics

---- Files affected:
packages/openmotif:
   openmotif-parbuild.patch (1.1 -> 1.2) , openmotif.spec (1.82 -> 1.83) , openmotif-libtool.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/openmotif/openmotif-parbuild.patch
diff -u packages/openmotif/openmotif-parbuild.patch:1.1 packages/openmotif/openmotif-parbuild.patch:1.2
--- packages/openmotif/openmotif-parbuild.patch:1.1	Tue Nov 27 19:37:18 2007
+++ packages/openmotif/openmotif-parbuild.patch	Sun Jun 21 02:54:19 2009
@@ -1,14 +1,5 @@
 --- openmotif-2.3.0/tools/wml/Makefile.am.orig	2002-10-06 15:08:48.000000000 +0200
 +++ openmotif-2.3.0/tools/wml/Makefile.am	2007-11-27 18:36:24.867755647 +0100
-@@ -27,7 +27,7 @@
- wmluiltok_LDADD = @LEXLIB@
- 
- wml_SOURCES = wml.c
--wml_LDADD = -L. -lwml
-+wml_LDADD = libwml.a
- 
- wmldbcreate_LDADD = ../../lib/Xm/libXm.la
- 
 @@ -36,6 +36,8 @@
  noinst_LIBRARIES = libwml.a
  libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c

================================================================
Index: packages/openmotif/openmotif.spec
diff -u packages/openmotif/openmotif.spec:1.82 packages/openmotif/openmotif.spec:1.83
--- packages/openmotif/openmotif.spec:1.82	Thu Nov  6 18:03:13 2008
+++ packages/openmotif/openmotif.spec	Sun Jun 21 02:54:19 2009
@@ -8,12 +8,12 @@
 Summary:	OpenMotif
 Summary(pl.UTF-8):	OpenMotif
 Name:		openmotif
-Version:	2.3.1
-Release:	3
+Version:	2.3.2
+Release:	1
 License:	Open Group Public License
 Group:		X11/Libraries
 Source0:	ftp://ftp.ics.com/openmotif/2.3/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	b6acc7fecec611bc39b1b3f4b2a0e452
+# Source0-md5:	bf5479d52bc114d299200ec20e463e96
 #Source1:	%{name}-%{version}-icsextra.tgz
 Source2:	mwmrc
 Source3:	mwm.RunWM
@@ -24,16 +24,16 @@
 Patch2:		%{name}-bison.patch
 Patch3:		%{name}-freetype.patch
 Patch4:		%{name}-parbuild.patch
-Patch5:		%{name}-libtool.patch
 URL:		http://www.openmotif.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	freetype-devel
-BuildRequires:	libtool
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libtool
+BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-data-xbitmaps
 BuildRequires:	xorg-lib-libXft-devel
@@ -84,7 +84,7 @@
 OpenMotif shared libraries.
 
 %description libs -l pl.UTF-8
-Biblioteki współdzielone OpenMotif.
+Biblioteki współdzielone OpenMotifa.
 
 %package devel
 Summary:	OpenMotif devel
@@ -114,7 +114,7 @@
 OpenMotif static libraries.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne OpenMotif.
+Biblioteki statyczne OpenMotifa.
 
 %package demos
 Summary:	OpenMotif demos
@@ -126,7 +126,7 @@
 OpenMotif demos.
 
 %description demos -l pl.UTF-8
-Programy demonstracyjne do OpenMotif.
+Programy demonstracyjne OpenMotifa.
 
 %package mwm
 Summary:	Motif window manager
@@ -175,7 +175,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -188,6 +187,7 @@
 %configure \
 	--enable-shared \
 	--enable-static \
+	--enable-themes \
 	--enable-xft \
 	--enable-jpeg \
 	--enable-png \
@@ -204,9 +204,11 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	bmdir=%{xbitmapsdir} \
+	bindir=%{_bindir} \
 	binddir=%{xlibdir}/bindings
 
 cd demos
+# breaks -bi --short-circuit !
 %{__make} clean
 cp -a * $RPM_BUILD_ROOT%{_examplesdir}/motif
 rm -rf $RPM_BUILD_ROOT%{_datadir}/Xm
@@ -300,6 +302,7 @@
 %attr(755,root,root) %{_bindir}/piano
 %attr(755,root,root) %{_bindir}/sampler2_0
 %attr(755,root,root) %{_bindir}/setDate
+%attr(755,root,root) %{_bindir}/simpleDemo
 %attr(755,root,root) %{_bindir}/simpledrop
 %attr(755,root,root) %{_bindir}/tabstack
 %attr(755,root,root) %{_bindir}/todo
@@ -331,6 +334,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2009/06/21 00:54:19  gotar
+- upgraded to 2.3.2 (from pre-2.3.1! final release was 2.3.1-1);
+- pass bindir for demos/programs (default ${prefix}/share/Xm since 2.3.1)
+- libtool patch in sources since final 2.3.1 too,
+- BR: libuuid-devel (libXm.la only), --enable-themes (currently: nothing),
+- note on breaking short-circuit, cosmetics
+
 Revision 1.82  2008/11/06 17:03:13  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openmotif/openmotif-parbuild.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openmotif/openmotif.spec?r1=1.82&r2=1.83&f=u