rpms/openmotif/devel openMotif-2.3.0-bindings.patch, NONE, 1.1 openMotif-2.3.0-mwmrc_dir.patch, NONE, 1.1 openMotif-2.3.0-no_X11R6.patch, NONE, 1.1 openmotif.spec, 1.38, 1.39
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 9 14:10:59 UTC 2005
Author: twoerner
Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15666
Modified Files:
openmotif.spec
Added Files:
openMotif-2.3.0-bindings.patch openMotif-2.3.0-mwmrc_dir.patch
openMotif-2.3.0-no_X11R6.patch
Log Message:
[tw]
- moved mwmrc to /etc/X11/mwm
- moved bindings to /usr/share/X11
- fixed paths in man pages containing /usr/X11R6
openMotif-2.3.0-bindings.patch:
configure | 2 +-
configure.ac | 2 +-
doc/man/man3/VirtualBindings.3 | 2 +-
lib/Xm/XmosP.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE openMotif-2.3.0-bindings.patch ---
--- openmotif-2.3.0/lib/Xm/XmosP.h.bindings 2005-12-09 10:00:36.000000000 +0100
+++ openmotif-2.3.0/lib/Xm/XmosP.h 2005-12-09 11:07:22.000000000 +0100
@@ -188,7 +188,7 @@
#define XMBINDDIR "XMBINDDIR"
#ifndef XMBINDDIR_FALLBACK
-#define XMBINDDIR_FALLBACK "/usr/lib/Xm/bindings"
+#define XMBINDDIR_FALLBACK "/usr/share/X11/bindings"
#endif
#define XMBINDFILE "xmbind.alias"
#define MOTIFBIND ".motifbind"
--- openmotif-2.3.0/doc/man/man3/VirtualBindings.3.bindings 2005-12-09 11:08:27.000000000 +0100
+++ openmotif-2.3.0/doc/man/man3/VirtualBindings.3 2005-12-09 11:09:03.000000000 +0100
@@ -90,7 +90,7 @@
If it has found no bindings, Motif next looks for the file
\fBxmbind\&.alias\fP in the directory specified by the environment
variable \fBXMBINDDIR\fP, if \fBXMBINDDIR\fP is set, or in the directory
-\fB/usr/lib/Xm/bindings\fP if \fBXMBINDDIR\fP is not set\&.
+\fB/usr/share/X11/bindings\fP if \fBXMBINDDIR\fP is not set\&.
If this file exists Motif searches it for a pathname associated with the
vendor string or with the vendor string and vendor release\&.
If it finds such a pathname and if that file exists, Motif loads the
--- openmotif-2.3.0/configure.ac.bindings 2005-12-09 09:59:04.000000000 +0100
+++ openmotif-2.3.0/configure.ac 2005-12-09 09:59:08.000000000 +0100
@@ -166,7 +166,7 @@
INCDIR="${includedir}/X11"
AC_SUBST(INCDIR)
-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
+XMBINDDIR_FALLBACK="${prefix}/share/X11/bindings"
AC_SUBST(XMBINDDIR_FALLBACK)
AC_ARG_ENABLE(motif22-compatibility, [ --disable-motif22-compatibility
--- openmotif-2.3.0/configure.bindings 2005-12-09 09:59:35.000000000 +0100
+++ openmotif-2.3.0/configure 2005-12-09 09:59:37.000000000 +0100
@@ -27263,7 +27263,7 @@
INCDIR="${includedir}/X11"
-XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
+XMBINDDIR_FALLBACK="${prefix}/share/X11/bindings"
# Check whether --enable-motif22-compatibility or --disable-motif22-compatibility was given.
openMotif-2.3.0-mwmrc_dir.patch:
clients/mwm/Makefile.am | 2 +-
clients/mwm/Makefile.in | 2 +-
clients/mwm/WmResParse.c | 12 ++++++------
doc/man/man1/mwm.1 | 8 ++++----
doc/man/man4/mwmrc.4 | 12 ++++++------
5 files changed, 18 insertions(+), 18 deletions(-)
--- NEW FILE openMotif-2.3.0-mwmrc_dir.patch ---
--- openmotif-2.3.0/doc/man/man1/mwm.1.mwmrcdir 2002-01-05 16:21:11.000000000 +0100
+++ openmotif-2.3.0/doc/man/man1/mwm.1 2005-12-09 15:07:38.000000000 +0100
@@ -678,8 +678,8 @@
\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,9 +1344,9 @@
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
.PP
--- openmotif-2.3.0/doc/man/man4/mwmrc.4.mwmrcdir 2005-12-09 14:59:00.000000000 +0100
+++ openmotif-2.3.0/doc/man/man4/mwmrc.4 2005-12-09 14:59:02.000000000 +0100
@@ -57,7 +57,7 @@
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 @@
.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 @@
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 @@
.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
--- openmotif-2.3.0/clients/mwm/WmResParse.c.mwmrcdir 2002-05-17 17:21:53.000000000 +0200
+++ openmotif-2.3.0/clients/mwm/WmResParse.c 2005-12-09 09:23:28.000000000 +0100
@@ -2402,15 +2402,15 @@
{
#endif /* PANELIST */
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib/X11"
+#ifndef MWMRC_DIR
+#define MWMRC_DIR "/etc/X11/mwm"
#endif
if (LANG != NULL)
{
#ifdef WSM
if (MwmBehavior)
{
- strcpy(cfileName, LIBDIR);
+ strcpy(cfileName, MWMRC_DIR);
strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
@@ -2426,7 +2426,7 @@
/*
* Try /$LANG/system.mwmrc within the install tree
*/
- strcpy(cfileName, LIBDIR);
+ strcpy(cfileName, MWMRC_DIR);
strncat(cfileName, "/", MAXWMPATH-strlen(cfileName));
strncat(cfileName, LANG, MAXWMPATH-strlen(cfileName));
strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
@@ -2448,7 +2448,7 @@
#ifdef WSM
if (MwmBehavior)
{
- strcpy(cfileName, LIBDIR);
+ strcpy(cfileName, MWMRC_DIR);
strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
#ifdef PANELIST
fileP = fopen (cfileName, "r");
@@ -2472,7 +2472,7 @@
/*
* Try /system.mwmrc within the install tree
*/
- strcpy(cfileName, LIBDIR);
+ strcpy(cfileName, MWMRC_DIR);
strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
if (LANG != NULL)
--- openmotif-2.3.0/clients/mwm/Makefile.am.mwmrcdir 2005-12-09 09:21:04.000000000 +0100
+++ openmotif-2.3.0/clients/mwm/Makefile.am 2005-12-09 09:21:19.000000000 +0100
@@ -4,7 +4,7 @@
SUBDIRS = WmWsmLib
-rcdir = @LIBDIR@
+rcdir = /etc/X11/mwm
rc_DATA = system.mwmrc
--- openmotif-2.3.0/clients/mwm/Makefile.in.mwmrcdir 2005-12-09 13:40:46.000000000 +0100
+++ openmotif-2.3.0/clients/mwm/Makefile.in 2005-12-09 13:40:48.000000000 +0100
@@ -252,7 +252,7 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = Mwm.msg $(rc_DATA)
SUBDIRS = WmWsmLib
-rcdir = @LIBDIR@
+rcdir = /etc/X11/mwm
rc_DATA = system.mwmrc
mwm_LDADD = ./WmWsmLib/libWsm.a ../../lib/Xm/libXm.la
INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART \
openMotif-2.3.0-no_X11R6.patch:
mwm.1 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE openMotif-2.3.0-no_X11R6.patch ---
--- openmotif-2.3.0/doc/man/man1/mwm.1.no_X11R6 2005-12-09 15:08:21.000000000 +0100
+++ openmotif-2.3.0/doc/man/man1/mwm.1 2005-12-09 15:09:06.000000000 +0100
@@ -366,7 +366,7 @@
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 @@
.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 @@
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 @@
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\&.
@@ -1348,7 +1348,7 @@
.PP
\fB/etc/X11/mwm/system\&.mwmrc\fP
.PP
-\fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP
+\fB/usr/share/X11/app-defaults/Mwm\fP
.PP
\fB$HOME/Mwm\fP
.PP
Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- openmotif.spec 8 Dec 2005 14:21:43 -0000 1.38
+++ openmotif.spec 9 Dec 2005 14:10:57 -0000 1.39
@@ -23,7 +23,6 @@
Patch22: openMotif-2.3.0-no_demos.patch
Patch23: openMotif-2.2.3-uil_lib.patch
-Patch25: openMotif-2.3.0-libdir.patch
Patch32: openMotif-2.3.0-CAN-2004-0914.patch
Patch33: openMotif-2.2.3-CAN-2004-0914_autofoo.patch
Patch34: openMotif-2.2.3-tmpnam.patch
@@ -35,6 +34,9 @@
Patch42: openMotif-2.2.3-mrm.patch
Patch43: openMotif-2.3.0-rgbtxt.patch
Patch44: openMotif-2.3.0-xft-config.patch
+Patch45: openMotif-2.3.0-mwmrc_dir.patch
+Patch46: openMotif-2.3.0-bindings.patch
+Patch47: openMotif-2.3.0-no_X11R6.patch
Conflicts: lesstif <= 0.92.32-6
@@ -61,7 +63,6 @@
%setup -q -n %{intern_name}-%{version}
%patch22 -p1 -b .no_demos
%patch23 -p1 -b .uil_lib
-%patch25 -p1 -b .libdir
%patch32 -p1 -b .CAN-2004-0914
%patch33 -p1 -b .CAN-2004-0914_autofoo
%patch34 -p1 -b .tmpnam
@@ -73,6 +74,9 @@
%patch42 -p1 -b .mrm
%patch43 -p1 -b .rgbtxt
%patch44 -p1 -b .xft-config
+%patch45 -p1 -b .mwmrc_dir
+%patch46 -p1 -b .bindings
+%patch47 -p1 -b .no_X11R6
for i in doc/man/man3/{XmColumn,XmDataField}.3; do
iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
@@ -119,14 +123,14 @@
%defattr(-,root,root)
%doc COPYRIGHT.MOTIF README RELEASE RELNOTES
/etc/X11/xinit/xinitrc.d/xmbind.sh
+/etc/X11/mwm/system.mwmrc
%{prefix}/bin/mwm
%{prefix}/bin/xmbind
%{prefix}/include/X11/bitmaps/*
-%{prefix}/lib/X11/system.mwmrc
-%{prefix}/lib/X11/bindings
%{prefix}/%{_lib}/libMrm.so.*
%{prefix}/%{_lib}/libUil.so.*
%{prefix}/%{_lib}/libXm.so.*
+%{_datadir}/X11/bindings
%{_datadir}/man/man1/mwm*
%{_datadir}/man/man1/xmbind*
%{_datadir}/man/man4/mwmrc*
@@ -144,6 +148,11 @@
%{_datadir}/man/man5/*
%changelog
+* Fri Dec 9 2005 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.1
+- moved mwmrc to /etc/X11/mwm
+- moved bindings to /usr/share/X11
+- fixed paths in man pages containing /usr/X11R6
+
* Thu Dec 8 2005 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.1
- enabled Xft, jpeg and png support
- patch for missing xft-config
More information about the fedora-cvs-commits
mailing list