rpms/lesstif/devel lesstif-64.patch, NONE, 1.1 mwm.desktop, NONE, 1.1 lesstif.spec, 1.10, 1.11
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Thu Aug 16 00:45:00 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22213
Modified Files:
lesstif.spec
Added Files:
lesstif-64.patch mwm.desktop
Log Message:
* Wed Aug 15 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-17
- conform better to openmotif API, lesstif-64.patch, by
kgallowa at redhat.com
- fix licenses
- keep timestamps
- add mwm xsession file
lesstif-64.patch:
--- NEW FILE lesstif-64.patch ---
--- lesstif-0.95.0/include/Motif-2.1/Xm/MwmUtil.h 2007-01-05 06:19:42.000000000 -0500
+++ lesstif-0.95.0/include/Motif-2.1/Xm/MwmUtil.h 2007-08-02 15:44:09.000000000 -0400
@@ -33,11 +33,11 @@
#endif
typedef struct {
- CARD32 flags;
- CARD32 functions;
- CARD32 decorations;
- INT32 input_mode;
- CARD32 status;
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long input_mode;
+ unsigned long status;
} MotifWmHints, MwmHints;
#define MWM_HINTS_FUNCTIONS (1L << 0)
@@ -100,11 +100,11 @@
* _MWM_HINTS property
*/
typedef struct {
- CARD32 flags;
- CARD32 functions;
- CARD32 decorations;
- INT32 inputMode;
- CARD32 status;
+ unsigned long flags;
+ unsigned long functions;
+ unsigned long decorations;
+ long inputMode;
+ unsigned long status;
} PropMotifWmHints;
typedef PropMotifWmHints PropMwmHints;
--- NEW FILE mwm.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Mwm
Comment=Lesstif Motif window manager clone based on fvwm
Exec=mwm
Terminal=False
TryExec=mwm
[Window Manager]
SessionManaged=true
Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lesstif.spec 5 Jan 2007 10:42:57 -0000 1.10
+++ lesstif.spec 16 Aug 2007 00:44:26 -0000 1.11
@@ -1,13 +1,44 @@
Summary: OSF/Motif(R) library clone
Name: lesstif
Version: 0.95.0
-Release: 15%{?dist}
-License: LGPL
+Release: 16%{?dist}
+License: LGPLv2+
+# in Xm-2.1/
+# some files are MIT
+# LTV6Editres.c XpmAttrib.c XpmCrBufFrI.c XpmCrBufFrP.c XpmCrDatFrI.c
+# XpmCrDatFrP.c Xpmcreate.c XpmCrIFrBuf.c XpmCrIFrDat.c XpmCrIFrP.c
+# XpmCrPFrBuf.c XpmCrPFrDat.c XpmCrPFrI.c Xpmdata.c Xpmhashtab.c XpmImage.c
+# XpmInfo.c Xpmmisc.c Xpmparse.c XpmRdFToBuf.c XpmRdFToDat.c XpmRdFToI.c
+# XpmRdFToP.c Xpmrgb.c Xpmscan.c Xpms_popen.c XpmWrFFrBuf.c XpmWrFFrDat.c
+# XpmWrFFrI.c XpmWrFFrP.c
+# Transltns.c is machine generated (no license, assuming public domain)
+
+# no restriction: lib/config/mxmkmf.in
+
+# in includes
+# MIT:
+# XmI/LTV5EditresP.h XmI/LTV6EditresP.h XmI/XpmI.h Xm/XpmP.h
+
+# clients/Motif-2.1/mwm/
+# MIT:
+# mwm.h cursors.c decorate.c desktop.c events.c functions.c menus.c misc.c
+# mwm.c pan.c props.c resize.c screens.c windows.c
+# no restriction
+# colormaps.c icons.c move.c pager.c
+# GPLV2+
+# gethostname.c mwmparse.h
+
+# clients/Motif-2.1/uil/
+# no license (GPLv2+?)
+# Expression.c
+# GPLV2+
+# yacc.h
+
Group: System Environment/Libraries
-#Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
-#Source: http://dl.sf.net/lesstif/lesstif-%{version}.tar.bz2
-Source: http://belnet.dl.sourceforge.net/sourceforge/lesstif/lesstif-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: lesstif-xmbind
+# mwm session file
+Source2: mwm.desktop
# put mwm conf file in %{_sysconfdir}, and install Dt in %_libdir
Patch0: lesstif-Makefile.in.diff
# have motif-config honor libdir
@@ -17,6 +48,9 @@
Patch4: lesstif-0.95.0-c++fix.patch
Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.94.4-2.diff.gz
Patch6: lesstif-0.95.0-scroll.patch
+# patch from kgallowa at redhat.com, to achieve API conformance with
+# openmotif on 64 bit.
+Patch7: lesstif-64.patch
Url: http://www.lesstif.org/
@@ -40,7 +74,7 @@
#Obsoletes: openmotif <= 2.3.0-0.2.1
# openmotif21 provides the same soname than lesstif. Both seem to work
# fine with some apps (ddd, xpdf) but show binary incompatibility with
-# nedit and runtime incompatible with grace. Moreover openmotif21
+# nedit and runtime incompatible with grace. Moreover openmotif21 libs
# are in /usr/X11R6/lib, and therefore may not be found by the linker.
# A conflict would break upgrade paths.
Obsoletes: openmotif21 <= 2.1.30-17.1.1
@@ -59,6 +93,7 @@
%package clients
Summary: Command line utilities for LessTif
+License: GPLv2+
Group: Applications/System
Requires: %{name} = %{version}-%{release}
@@ -70,6 +105,7 @@
%package mwm
Summary: Lesstif Motif window manager clone based on fvwm
+License: GPLv2+
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
@@ -92,10 +128,11 @@
%description devel
-Lesstif-devel contains the lesstif static library and header files
-required to develop Motif based applications using LessTif. If you
-want to develop LessTif applications, you'll need to install
-lesstif-devel along with lesstif.
+Lesstif-devel contains the header files required to develop
+Motif based applications using LessTif. If you want to develop
+LessTif applications, you'll need to install lesstif-devel
+along with lesstif.
+
%prep
%setup -q
@@ -104,14 +141,21 @@
%patch1 -p1 -b .multilib
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+%patch4 -p1 -b .VendorSP
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+
+# correct patched header file timestamp
+touch -r include/Motif-2.1/Xm/VendorSP.h.VendorSP include/Motif-2.1/Xm/VendorSP.h
-# those substitutions are not usefull, since the symbols are defined
+# those substitutions are not really usefull, since the symbols are redefined
# in the Makefile, but it is clearer like that
+touch -r clients/Motif-2.1/mwm/mwm.h __mwm_stamp
sed -i -e 's:"/usr/X11/include":"%{_includedir}":' \
-e 's:"/usr/lib/X11/mwm":"%{_sysconfdir}/mwm":' clients/Motif-2.1/mwm/mwm.h
+touch -r __mwm_stamp clients/Motif-2.1/mwm/mwm.h
+rm __mwm_stamp
%build
# --enable-shared --disable-static is the default
@@ -135,7 +179,8 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT \
- appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config'
+ appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config' \
+ INSTALL="install -p"
# Handle debuginfo dangling-relative-symlink
# rpm doesn't handle symlinks properly when generating debuginfo
@@ -143,17 +188,23 @@
cp -a clients/Motif-1.2/xmbind/xmbind.c \
clients/Motif-2.1/xmbind/xmbind.c
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_prefix}/LessTif
# install a script that launches xmbind in xinit
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/xmbind.sh
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/xmbind.sh
+
+# install mwm xsession file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/
+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xsessions/
# correct the paths in mxmkmf
-sed -i -e 's:"\${xprefix}/lib/X11/config":%{_datadir}/X11/config":' \
- -e 's:"\${lprefix}/lib/LessTif/config":%{_datadir}/X11/config":' \
+sed -i -e 's:"\${xprefix}/lib/X11/config":"%{_datadir}/X11/config":' \
+ -e 's:"\${lprefix}/lib/LessTif/config":"%{_datadir}/X11/config":' \
$RPM_BUILD_ROOT%{_bindir}/mxmkmf
+# use .in timestamp, since the .in and resulting files are the same
+touch -r lib/config/mxmkmf.in $RPM_BUILD_ROOT%{_bindir}/mxmkmf
# this is referenced into mwm
mkdir -p $RPM_BUILD_ROOT%{_includedir}/X11/bitmaps/
@@ -165,22 +216,39 @@
rm $RPM_BUILD_ROOT%{_mandir}/man*/ltversion*
# prepare docs
-cp -a doc clean_docs
-find clean_docs -name 'Makefile*' -exec rm {} \;
-rm clean_docs/lessdox/clients/*.1 clean_docs/lessdox/clients/*.5
-rm clean_docs/lessdox/widgets/*.3
+rm -rf __fedora_clean_docs
+cp -a doc __fedora_clean_docs
+find __fedora_clean_docs -name 'Makefile*' -exec rm {} \;
+# correct timestamps of html files generated from man pages
+# and remove man pages
+for suffix in 1 5 3; do
+ for file in __fedora_clean_docs/lessdox/*/*.$suffix; do
+ basefile=`basename $file .$suffix`
+ dir=`dirname $file`
+ touch -r $file $dir/$basefile.html
+ rm $file
+ done
+done
# remove the empty directory
-rmdir clean_docs/lessdox/functions
+rmdir __fedora_clean_docs/lessdox/functions
# remove host.def, it lives in the imake package
rm $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
+# use ChangeLog file timestamp to have the same timestamp on all arches
+# for noarch files
+touch -r ChangeLog $RPM_BUILD_ROOT%{_datadir}/X11/config/LessTif.tmpl \
+ $RPM_BUILD_ROOT%{_includedir}/Xm/Xm.h
+
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root,-)
%doc COPYING COPYING.LIB CREDITS AUTHORS BUG-REPORTING FAQ README
@@ -197,6 +265,7 @@
%{_includedir}/X11/bitmaps/
%{_bindir}/mwm
%{_mandir}/man*/mwm*
+%{_datadir}/xsessions/mwm.desktop
%{_datadir}/X11/app-defaults/Mwm
%files clients
@@ -209,7 +278,7 @@
%files devel
%defattr(-,root,root,-)
-%doc clean_docs/*
+%doc __fedora_clean_docs/*
%{_bindir}/motif-config
%{_bindir}/mxmkmf
%{_includedir}/Dt/
@@ -223,7 +292,15 @@
%{_datadir}/aclocal/ac_find_motif.m4
%{_datadir}/X11/config/*
+
%changelog
+* Wed Aug 15 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-16
+- conform better to openmotif API, lesstif-64.patch, by
+ kgallowa at redhat.com
+- fix licenses
+- keep timestamps
+- add mwm xsession file
+
* Fri Jan 5 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-15
- Obsolete openmotif21 versions provided in older fedora core releases.
openmotif21 provides the same soname than lesstif, with some
More information about the fedora-extras-commits
mailing list