rpms/openmotif/F-13 openmotif-2.3.3-paths.patch, NONE, 1.1 openmotif.spec, 1.1, 1.2 sources, 1.2, 1.3 openMotif-2.3.0-mwmrc_dir.patch, 1.1, NONE openMotif-2.3.0-no_X11R6.patch, 1.1, NONE

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/nonfree/rpms/openmotif/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24714

Modified Files:
	openmotif.spec sources 
Added Files:
	openmotif-2.3.3-paths.patch 
Removed Files:
	openMotif-2.3.0-mwmrc_dir.patch openMotif-2.3.0-no_X11R6.patch 
Log Message:
New upstream release

openmotif-2.3.3-paths.patch:
 clients/mwm/WmResParse.c |    2 +-
 configure.ac             |    2 +-
 doc/man/man1/mwm.1       |   18 +++++++++---------
 doc/man/man4/mwmrc.4     |   12 ++++++------
 lib/Xm/Makefile.am       |   10 ----------
 5 files changed, 17 insertions(+), 27 deletions(-)

--- NEW FILE openmotif-2.3.3-paths.patch ---
diff -up openmotif-2.3.3/clients/mwm/WmResParse.c.paths openmotif-2.3.3/clients/mwm/WmResParse.c
--- openmotif-2.3.3/clients/mwm/WmResParse.c.paths	2009-06-22 23:51:51.000000000 +0200
+++ openmotif-2.3.3/clients/mwm/WmResParse.c	2010-03-31 20:36:20.809279515 +0200
@@ -2403,7 +2403,7 @@ FILE *FopenConfigFile (void)
 #endif /* PANELIST */
 
 #ifndef MWMRCDIR
-#define MWMRCDIR "/usr/lib/X11"
+#define MWMRCDIR "/etc/X11/mwm"
 #endif
     if (LANG != NULL)
     {
diff -up openmotif-2.3.3/configure.ac.paths openmotif-2.3.3/configure.ac
--- openmotif-2.3.3/configure.ac.paths	2009-10-27 17:10:23.000000000 +0100
+++ openmotif-2.3.3/configure.ac	2010-03-31 20:36:20.809279515 +0200
@@ -179,7 +179,7 @@ AC_SUBST(CDE_CONFIGURATION_TOP)
 LIBDIR="${libdir}/X11"
 AC_SUBST(LIBDIR)
 
-MWMRCDIR="${libdir}/X11"
+MWMRCDIR="/etc/X11/mwm"
 AC_SUBST(MWMRCDIR)
 
 INCDIR="${includedir}/X11"
diff -up openmotif-2.3.3/doc/man/man1/mwm.1.paths openmotif-2.3.3/doc/man/man1/mwm.1
--- openmotif-2.3.3/doc/man/man1/mwm.1.paths	2002-01-05 16:21:11.000000000 +0100
+++ openmotif-2.3.3/doc/man/man1/mwm.1	2010-03-31 20:36:20.810279833 +0200
@@ -366,7 +366,7 @@ The \fBmwm\fP command is configured from
 database\&. This database is built from the following sources\&. They are listed
 in order of precedence, low to high:
 .PP
-\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP
+\fB/usr/share/X11/app-defaults/Mwm\fP
 .PP
 \fB$HOME/Mwm\fP
 .PP
@@ -376,7 +376,7 @@ in order of precedence, low to high:
 .PP
 \fBmwm\fP command line options
 .PP
-The file names \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP and \fB$HOME/Mwm\fP represent customary locations for these files\&. The actual
+The file names \fB/usr/share/X11/app-defaults/Mwm\fP and \fB$HOME/Mwm\fP represent customary locations for these files\&. The actual
 location of the system-wide class resource file may depend on the \fBXFILESEARCHPATH\fP environment variable and the
 current language environment\&. The actual location of the user-specific class
 resource file may depend on the \fBXUSERFILESEARCHPATH\fP and \fBXAPPLRESDIR\fP
@@ -595,7 +595,7 @@ lw(1.528376i) lw(1.592955i) lw(1.054795i
 NameClassValue TypeDefault
 autoKeyFocusAutoKeyFocusT/FT
 autoRaiseDelayAutoRaiseDelaymillisec500
-bitmap-Bitmap-directory/usr/X11R6/include-
+bitmap-Bitmap-directory/usr/include-
 DirectoryDirectory/X11/bitmaps
 clientAutoPlaceClientAutoPlaceT/FT
 colormapFocus-ColormapFocus-stringkeyboard
@@ -650,7 +650,7 @@ the keyboard focus\&. The default value 
 This resource identifies a directory to be searched for bitmaps referenced
 by \fBmwm\fP resources\&. This directory is searched if a bitmap
 is specified without an absolute pathname\&. The default value for this resource
-is \fB/usr/X11R6/include/X11/bitmaps\fP\&. The directory \fB/usr/X11R6/include/X11/bitmaps\fP
+is \fB/usr/include/X11/bitmaps\fP\&. The directory \fB/usr/include/X11/bitmaps\fP
 represents the customary locations for this directory\&. The actual
 location of this directory may vary on some systems\&. If the bitmap is not
 found in the specified directory, \fBXBMLANGPATH\fP is searched\&.
@@ -678,8 +678,8 @@ is set, \fBmwm\fP looks for \fI$HOME/$LA
 \fB$HOME\fP/\fBconfigFile\fP\&. If the \fIconfigFile\fP pathname does not begin with "~/" or "/", \fBmwm\fP considers it to be relative to the current working directory\&. If
 the \fIconfigFile\fP resource is not specified
 or if that file does not exist, \fBmwm\fP uses several default
-paths to find a configuration file\&. The order of the search is shown below: \fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP\(dg
-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
+paths to find a configuration file\&. The order of the search is shown below: \fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP\(dg
+\fB/etc/X11/mwm/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
 implementation dependent\&.
 .IP "\fIdeiconifyKeyFocus\fP\ (class\  \fIDeiconifyKeyFocus\fP)" 10
 This resource applies only when the keyboard input focus policy is explicit\&.
@@ -1344,11 +1344,11 @@ the shell to use when executing commands
 function\&.
 .SS "Files"
 .PP
-\fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP
+\fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP
 .PP
-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP
+\fB/etc/X11/mwm/system\&.mwmrc\fP
 .PP
-\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP
+\fB/usr/share/lib/X11/app-defaults/Mwm\fP
 .PP
 \fB$HOME/Mwm\fP
 .PP
diff -up openmotif-2.3.3/doc/man/man4/mwmrc.4.paths openmotif-2.3.3/doc/man/man4/mwmrc.4
--- openmotif-2.3.3/doc/man/man4/mwmrc.4.paths	2002-01-05 16:21:12.000000000 +0100
+++ openmotif-2.3.3/doc/man/man4/mwmrc.4	2010-03-31 20:36:20.810279833 +0200
@@ -57,7 +57,7 @@ file that controls much of the behavior 
 It contains descriptions of resources that cannot easily be
 written using standard X Window System, Version 11 resource syntax\&. The resource
 description file contains entries that are referred to by X resources in
-defaults files (for example, \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP)
+defaults files (for example, \fB/usr/share/X11/app-defaults/Mwm\fP)
 or in the \fBRESOURCE_MANAGER\fP property on the
 root window\&. For example, the resource description file enables you to specify
 different types of window menus; however, an X resource is used to specify
@@ -72,8 +72,8 @@ on a per-user basis:
 .nf
 \f(CW$HOME/$LANG/\&.mwmrc
 $HOME/\&.mwmrc
-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
-/usr/X11R6/lib/X11/system\&.mwmrc\fR
+/etc/X11/mwm/$LANG/system\&.mwmrc
+/etc/X11/mwm/system\&.mwmrc\fR
 .fi
 .PP
 .PP
@@ -84,7 +84,7 @@ resource\&. The following shows how a di
 be specified from the command line:
 .PP
 .nf
-\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR
+\f(CW/usr/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR
 .fi
 .PP
 .SS "Resource Types"
@@ -626,8 +626,8 @@ is not what you expect\&.
 .nf
 \fB$HOME/$LANG/\&.mwmrc
 $HOME/\&.mwmrc
-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
-/usr/X11R6/lib/X11/system\&.mwmrc\fP
+/etc/X11/mwm/$LANG/system\&.mwmrc
+/etc/X11/mwm/system\&.mwmrc\fP
 .fi
 .SH "RELATED INFORMATION"
 .PP
diff -up openmotif-2.3.3/lib/Xm/Makefile.am.paths openmotif-2.3.3/lib/Xm/Makefile.am
--- openmotif-2.3.3/lib/Xm/Makefile.am.paths	2010-03-31 20:38:31.206280155 +0200
+++ openmotif-2.3.3/lib/Xm/Makefile.am	2010-03-31 20:42:18.671037074 +0200
@@ -49,21 +49,11 @@ else
 EDITRES_SRCS =
 endif
 
-if OM_LIBJPEG
 JPEG_SRCS = Jpeg.c
 JPEG_HDRS = JpegI.h
-else
-JPEG_SRCS =
-JPEG_HDRS =
-endif
 
-if OM_LIBPNG
 PNG_SRCS = Png.c
 PNG_HDRS = PngI.h
-else
-PNG_SRCS =
-PNG_HDRS =
-endif
 
 if PRINTING
 PRINTS_SRC = PrintS.c


Index: openmotif.spec
===================================================================
RCS file: /cvs/nonfree/rpms/openmotif/F-13/openmotif.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmotif.spec	24 Sep 2009 16:00:32 -0000	1.1
+++ openmotif.spec	1 Apr 2010 17:36:10 -0000	1.2
@@ -1,15 +1,17 @@
+%global major 2.3
 Summary:	Open Motif runtime libraries and executables
 Name:		openmotif
-Version:	2.3.2
-Release:	5%{?dist}
+Version:	%{major}.3
+Release:	1%{?dist}
 License:	Open Group Public License
 Group:		System Environment/Libraries
-Source: 	ftp://ftp.ics.com/openmotif/2.3/2.3.2/%{name}-%{version}.tar.gz
+Source: 	ftp://ftp.ics.com/openmotif/%{major}/%{version}/%{name}-%{version}.tar.gz
 Source1:	xmbind
 Source2:	README.Fedora
 URL:		http://www.motifzone.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Buildrequires:	automake autoconf texinfo
 BuildRequires:	flex
 BuildRequires:	byacc
 BuildRequires:	libjpeg-devel libpng-devel
@@ -19,8 +21,7 @@
 
 Patch1:		openMotif-2.2.3-uil_lib.patch
 Patch2:		openMotif-2.3.0-rgbtxt.patch
-Patch3: 	openMotif-2.3.0-mwmrc_dir.patch
-Patch4: 	openMotif-2.3.0-no_X11R6.patch
+Patch3: 	openmotif-2.3.3-paths.patch
 
 # Conflicts:	lesstif
 
@@ -75,6 +76,7 @@
 Group:      Development/Libraries
 Conflicts:  lesstif-devel
 Requires:   openmotif-devel = %{version}-%{release}
+BuildArch:  noarch
 
 %description docs
 This is the Open Motif %{version} additional documentation
@@ -83,12 +85,14 @@
 %setup -q 
 %patch1 -p1 -b .uil_lib
 %patch2 -p1 -b .rgbtxt
-%patch3 -p1 -b .mwmrc_dir
-%patch4 -p1 -b .no_X11R6
+%patch3 -p1 -b .paths
 
 cp %{SOURCE2} .
 
 %build
+aclocal -I .
+automake --foreign
+autoconf
 %configure \
 	--enable-xft \
 	--enable-jpeg --enable-png
@@ -182,6 +186,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Mar 31 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.3.3-1
+- New upstream releasee
+- Make an unhappy RH employee happy
+
 * Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-5
 - Remove req. to /usr/share/X11/XKeysymDB
 
@@ -197,5 +205,5 @@
 - Try to fix conflict with lesstif-devel
 
 * Wed Mar 25 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-1
-- Initional Package for rpmfusion.org
+- Initional Package for rpmfusion.org (Based on the original RH release)
 


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/openmotif/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Sep 2009 16:00:32 -0000	1.2
+++ sources	1 Apr 2010 17:36:10 -0000	1.3
@@ -1 +1 @@
-bf5479d52bc114d299200ec20e463e96  openmotif-2.3.2.tar.gz
+fd27cd3369d6c7d5ef79eccba524f7be  openmotif-2.3.3.tar.gz


--- openMotif-2.3.0-mwmrc_dir.patch DELETED ---


--- openMotif-2.3.0-no_X11R6.patch DELETED ---