Author: laxathom Update of /cvs/nonfree/rpms/openmotif/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23575/devel Modified Files: .cvsignore sources Added Files: README.Fedora openMotif-2.2.3-uil_lib.patch openMotif-2.3.0-mwmrc_dir.patch openMotif-2.3.0-no_X11R6.patch openMotif-2.3.0-rgbtxt.patch openmotif.spec xmbind Log Message: Initial import. --- NEW FILE README.Fedora --- Because there is an conflict between openmotif-devel and lesstif-devel, I have moved the libraries and header files package in openmotif-devel into the following places: header files: %{_includedir}/openmotif Libraries: %{_libdir}/openmotif/lib openMotif-2.2.3-uil_lib.patch: --- NEW FILE openMotif-2.2.3-uil_lib.patch --- --- openmotif/clients/uil/Makefile.am.uil_lib 2003-12-16 13:41:53.000000000 +0100 +++ openmotif/clients/uil/Makefile.am 2003-12-16 13:41:55.000000000 +0100 @@ -13,7 +13,7 @@ libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la -uil_LDADD = ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la +uil_LDADD = libUil.la ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la INCLUDES = -DINCDIR=\"@INCDIR@\" \ -DLIBDIR=\"@LIBDIR@\" \ @@ -42,7 +42,7 @@ UilLstMac.c UilSemVal.c UilSemCSet.c UilDB.c SRCS = $(COMMON_SRC) -SRCS2 = $(COMMON_SRC) UilMain.c +SRCS2 = UilMain.c HEADERS_1 = Uil.h UilSymGl.h UilSymDef.h \ UilDef.h XmAppl.uil openMotif-2.3.0-mwmrc_dir.patch: --- 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: --- 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 openMotif-2.3.0-rgbtxt.patch: --- NEW FILE openMotif-2.3.0-rgbtxt.patch --- --- openmotif-2.3.0/lib/Xm/ColorS.c.rgbtxt 2004-07-07 14:24:07.000000000 +0200 +++ openmotif-2.3.0/lib/Xm/ColorS.c 2005-12-02 13:26:11.000000000 +0100 @@ -131,7 +131,7 @@ { XmNrgbFile, XmCString, XmRString, sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file), - XmRString, (XtPointer) "/usr/lib/X11/rgb.txt" + XmRString, (XtPointer) "/usr/share/X11/rgb.txt" }, #endif { --- openmotif-2.3.0/doc/man/man3/XmColorSelector.3.rgbtxt 2002-01-17 21:32:48.000000000 +0100 +++ openmotif-2.3.0/doc/man/man3/XmColorSelector.3 2005-12-02 13:25:26.000000000 +0100 @@ -34,7 +34,7 @@ noCellError%NoCellError%XmString%"No Color Cell %%% Available" redSliderLabel%SliderLabel%XmString%"Red" -rgbFile%String%String%/usr/lib/X11/rgb.txt +rgbFile%String%String%/usr/share/X11/rgb.txt sliderTogLabel%TogLabel%XmString%"Color Sliders" .TE .PP --- NEW FILE openmotif.spec --- Summary: Open Motif runtime libraries and executables Name: openmotif Version: 2.3.2 Release: 5%{?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 Source1: xmbind Source2: README.Fedora URL: http://www.motifzone.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flex BuildRequires: byacc BuildRequires: libjpeg-devel libpng-devel BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel BuildRequires: xorg-x11-xbitmaps BuildRequires: perl 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 # Conflicts: lesstif %description This is the Open Motif %{version} runtime environment. It includes the Motif shared libraries, needed to run applications which are dynamically linked against Motif, and the Motif Window Manager "mwm". %package devel Summary: Open Motif development libraries and header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libjpeg-devel libpng-devel Requires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel Provides: motif-devel = %{version}-%{release} %description devel This is the Open Motif %{version} development environment. It includes the static libraries and header files necessary to build Motif applications. %package clients Summary: Command line utilities for openmotif Group: Applications/System Conflicts: lesstif-clients Requires: %{name} = %{version}-%{release} %description clients Commandline utilities for openmotif * xmbind configure the vitual key bindings of openmotif applications. * uil is a user interface language compiler. %package mwm Summary: Open Motif window manager Group: User Interface/Desktops Conflicts: lesstif-mwm Requires: %{name} = %{version}-%{release} %description mwm "mwm" window manager that adheres largely to the Motif mwm specification. %package demos Summary: Open Motif example code and demo programs Group: Development/Libraries Requires: openmotif-devel = %{version}-%{release} %description demos This is the Open Motif %{version} example code and demo programs. %package docs Summary: Open Motif Additional Documentation Group: Development/Libraries Conflicts: lesstif-devel Requires: openmotif-devel = %{version}-%{release} %description docs This is the Open Motif %{version} additional documentation %prep %setup -q %patch1 -p1 -b .uil_lib %patch2 -p1 -b .rgbtxt %patch3 -p1 -b .mwmrc_dir %patch4 -p1 -b .no_X11R6 cp %{SOURCE2} . %build %configure \ --enable-xft \ --enable-jpeg --enable-png export LD_LIBRARY_PATH=`pwd`/lib/Mrm/.libs:`pwd`/lib/Xm/.libs make clean # SMP build doesn't works make # %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export LD_LIBRARY_PATH=`pwd`/lib/Mrm/.libs:`pwd`/lib/Xm/.libs make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d mkdir -p $RPM_BUILD_ROOT/%{_includedir}/openmotif mv $RPM_BUILD_ROOT/%{_includedir}/[Mu]* $RPM_BUILD_ROOT/%{_includedir}/openmotif mv $RPM_BUILD_ROOT/%{_includedir}/Xm $RPM_BUILD_ROOT/%{_includedir}/openmotif rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a mkdir -p $RPM_BUILD_ROOT/%{_libdir}/openmotif/ mv $RPM_BUILD_ROOT/%{_libdir}/lib* ${RPM_BUILD_ROOT}/%{_libdir}/openmotif/ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d %if "%{_lib}" == "lib64" cat <<EOF >$RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/openmotif-64.conf %{_libdir}/openmotif EOF %else cat <<EOF >$RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/openmotif.conf %{_libdir}/openmotif EOF %endif install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/xmbind.sh rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a mv -f $RPM_BUILD_ROOT%{_datadir}/Xm $RPM_BUILD_ROOT%{_libdir}/Xm %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYRIGHT.MOTIF README RELEASE RELNOTES %{_includedir}/X11/bitmaps/* %dir %{_libdir}/openmotif %{_libdir}/openmotif/lib*.so.* %{_libdir}/X11/bindings/ %{_sysconfdir}/ld.so.conf.d/* %files mwm %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/X11/mwm/system.mwmrc %{_bindir}/mwm %{_mandir}/man1/mwm* %{_mandir}/man4/mwm* %doc README.Fedora %files clients %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/X11/xinit/xinitrc.d/xmbind.sh %{_bindir}/uil %{_bindir}/xmbind %{_mandir}/man1/xmb* %{_mandir}/man1/uil* %files devel %defattr(-,root,root,-) %{_includedir}/openmotif/ %{_libdir}/openmotif/lib*.so %{_mandir}/man5/* %files demos %defattr(-,root,root,-) %{_libdir}/Xm/ %{_mandir}/manm/* %files docs %defattr(-,root,root,-) %{_mandir}/man3/* %changelog * Wed Sep 16 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-5 - Remove req. to /usr/share/X11/XKeysymDB * Tue Jul 14 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-4 - Change Destination for libs to %%{_libdir}/openmotif - Remove rpatch stuff - Remove utf-8 stuff * Mon Apr 20 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-3 - Changes to solve file confilicts * Thu Mar 26 2009 Jochen Schmitt <Jochen herr-schmitt de> 2.3.2-2 - 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 --- NEW FILE xmbind --- #! /bin/sh if [ -x /usr/X11R6/bin/xmbind ] ; then /usr/X11R6/bin/xmbind fi Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/openmotif/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Sep 2009 14:59:31 -0000 1.1 +++ .cvsignore 24 Sep 2009 16:00:32 -0000 1.2 @@ -0,0 +1 @@ +openmotif-2.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/openmotif/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Sep 2009 14:59:31 -0000 1.1 +++ sources 24 Sep 2009 16:00:32 -0000 1.2 @@ -0,0 +1 @@ +bf5479d52bc114d299200ec20e463e96 openmotif-2.3.2.tar.gz