rpms/lesstif/devel lesstif-Makefile.in.diff, NONE, 1.1 lesstif-motif-config-use_libdir.diff, NONE, 1.1 lesstif-xmbind, NONE, 1.1 lesstif.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Aug 30 18:11:55 UTC 2006
Author: pertusus
Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22603/devel
Modified Files:
.cvsignore sources
Added Files:
lesstif-Makefile.in.diff lesstif-motif-config-use_libdir.diff
lesstif-xmbind lesstif.spec
Log Message:
auto-import lesstif-0.95.0-7 on branch devel from lesstif-0.95.0-7.src.rpm
lesstif-Makefile.in.diff:
--- NEW FILE lesstif-Makefile.in.diff ---
diff -u --recursive lesstif-0.95.0-orig/clients/Motif-2.1/mwm/Makefile.in lesstif-0.95.0/clients/Motif-2.1/mwm/Makefile.in
--- lesstif-0.95.0-orig/clients/Motif-2.1/mwm/Makefile.in 2006-06-10 11:35:34.000000000 +0200
+++ lesstif-0.95.0/clients/Motif-2.1/mwm/Makefile.in 2006-08-23 00:27:05.000000000 +0200
@@ -301,7 +301,7 @@
$(X_LIBS) $(XPLIB) -lXt $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
appdir = $(libdir)/X11/app-defaults
-mwmddir = $(libdir)/X11/mwm
+mwmddir = $(sysconfdir)/mwm
mwmd_DATA = system.mwmrc alt.map README
AM_YFLAGS = -d
all: all-am
diff -u --recursive lesstif-0.95.0-orig/lib/Dt/Makefile.in lesstif-0.95.0/lib/Dt/Makefile.in
--- lesstif-0.95.0-orig/lib/Dt/Makefile.in 2006-06-10 11:35:38.000000000 +0200
+++ lesstif-0.95.0/lib/Dt/Makefile.in 2006-08-23 00:28:39.000000000 +0200
@@ -248,7 +248,8 @@
infodir = @infodir@
install_sh = @install_sh@
lib_version_suffix = @lib_version_suffix@
-libdir = $(exec_prefix)/lib
+#libdir = $(exec_prefix)/lib
+libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
man2html_cmd = @man2html_cmd@
Seulement dans lesstif-0.95.0: Makefile.in.orig
Seulement dans lesstif-0.95.0: Makefile.in.rej
lesstif-motif-config-use_libdir.diff:
--- NEW FILE lesstif-motif-config-use_libdir.diff ---
--- lesstif-0.95.0/scripts/motif-config.in.multilib 2006-08-30 18:22:22.000000000 +0200
+++ lesstif-0.95.0/scripts/motif-config.in 2006-08-30 18:22:04.000000000 +0200
@@ -2,14 +2,15 @@
#
# $Header: /cvsroot/lesstif/lesstif/scripts/motif-config.in,v 1.2 2005/01/14 19:36:00 dannybackx Exp $
#
-L="@prefix@"
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
XC="@X_CFLAGS@"
XL="@X_LIBS@"
XR="@XRENDER_LIBS@"
V="@PACKAGE_NAME@ @PACKAGE_VERSION@"
-prefix=$L
-exec_prefix=$L
exec_prefix_set=no
usage()
@@ -80,10 +81,10 @@
fi
if test "$echo_cflags" = "yes"; then
- echo "-I$L/include $XC"
+ echo "-I$includedir $XC"
fi
if test "$echo_libs" = "yes"; then
- echo "-L$L/lib -L/usr/X11R6/lib -lXm -lXt $my_glib_libs $XR -lXext -lX11"
+ echo "-L$libdir -lXm -lXt $my_glib_libs $XR -lXext -lX11"
fi
--- NEW FILE lesstif-xmbind ---
#! /bin/sh
if [ -x /usr/bin/xmbind ] ; then
/usr/bin/xmbind
fi
--- NEW FILE lesstif.spec ---
Summary: OSF/Motif(R) library clone
Name: lesstif
Version: 0.95.0
Release: 7%{?dist}
License: LGPL
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
Source1: lesstif-xmbind
# put mwm conf file in %{_sysconfdir}, and install Dt in %_libdir
Patch0: lesstif-Makefile.in.diff
# have motif-config honor libdir
Patch1: lesstif-motif-config-use_libdir.diff
Url: http://www.lesstif.org/
#Obsoletes: openmotif
#Provides: openmotif
#Conflicts: openmotif
# monolithic X
#BuildRequires: xorg-x11-devel
#BuildRequires: xorg-x11-deprecated-libs-devel
BuildRequires: libXp-devel libXt-devel libXext-devel
BuildRequires: freetype-devel fontconfig-devel
# lynx is used to transform html in txt
BuildRequires: lynx
# for tests, not used now.
# Missing X11/bitmaps/{Excl,...} required for another test.
BuildRequires: libGLw-devel
BuildRequires: bison
BuildRequires: flex
# needed for aclocal, to find the aclocal dir for the autoconf macro
BuildRequires: automake
Requires: xorg-x11-xinit
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
LessTif is a free replacement for OSF/Motif(R), which provides a full
set of widgets for application development (menus, text entry areas,
scrolling windows, etc.). LessTif is source compatible with
OSF/Motif(R).
This package provides the lesstif runtime libraries.
%package clients
Summary: Command line utilities for LessTif
Group: Applications/System
Requires: %{name} = %{version}-%{release}
%description clients
Command line utilities for LessTif:
* xmbind configures the virtual key bindings of LessTif applications.
* uil is a user interface language compiler.
%package mwm
Summary: Lesstif Motif window manager clone based on fvwm
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description mwm
"mwm" window manager that adheres largely to the Motif mwm specification.
Based on fvwm.
%package devel
Summary: Header files for LessTif/Motif development
Group: Development/Libraries
Requires: libXt-devel libXp-devel imake
# for %{_datadir}/aclocal/
Requires: automake
Requires: %{name} = %{version}-%{release}
#Obsoletes: openmotif-devel
#Provides: openmotif-devel
Conflicts: openmotif-devel
#Obsoletes: lesstif-1.2-devel
#Obsoletes: lesstif-2.0-devel
#Provides: lesstif-1.2-devel
#Provides: lesstif-2.0-devel
%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.
%prep
%setup -q
chmod a-x COPYING* doc/www.lesstif.org/BUG-HUNTING.html
%patch0 -p1
%patch1 -p1 -b .multilib
# those substitutions are not usefull, since the symbols are defined
# in the Makefile, but it is clearer like that
sed -i -e 's:"/usr/X11/include":"%{_includedir}":' \
-e 's:"/usr/lib/X11/mwm":"%{_sysconfdir}/mwm":' clients/Motif-2.1/mwm/mwm.h
%build
# --enable-shared --disable-static is the default
# the x libs and includes are empty in the default case, but we need to
# have a non empty include defined (for a substitution in mwm)
%configure \
--enable-shared \
--disable-static \
--with-xdnd \
--enable-production \
--disable-debug \
--x-includes=%{_includedir} \
--x-libraries=%{_libdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT \
appdir='%{_datadir}/X11/app-defaults' configdir='%{_datadir}/X11/config'
rm -f $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
# 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":' \
$RPM_BUILD_ROOT%{_bindir}/mxmkmf
# this is referenced into mwm
mkdir -p $RPM_BUILD_ROOT%{_includedir}/X11/bitmaps/
# will be in in %%doc
rm $RPM_BUILD_ROOT%{_sysconfdir}/mwm/README $RPM_BUILD_ROOT%{_sysconfdir}/mwm/alt.map
# the corresponding file is not shipped
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
# remove the empty directory
rmdir clean_docs/lessdox/functions
%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
%doc NEWS ReleaseNotes.html ReleaseNotes.txt
%{_libdir}/lib*.so.*
%{_mandir}/man1/lesstif*
%{_mandir}/man5/VirtualBindings*
%files mwm
%defattr(-,root,root,-)
%doc clients/Motif-2.1/mwm/README clients/Motif-2.1/mwm/alt.map
%dir %{_sysconfdir}/mwm/
%config(noreplace) %{_sysconfdir}/mwm/system.mwmrc
%{_includedir}/X11/bitmaps/
%{_bindir}/mwm
%{_mandir}/man*/mwm*
%{_datadir}/X11/app-defaults/Mwm
%files clients
%defattr(-,root,root,-)
%{_sysconfdir}/X11/xinit/xinitrc.d/*xmbind.sh
%{_bindir}/xmbind*
%{_bindir}/uil
%{_mandir}/man1/uil*
%{_mandir}/man1/xmbind*
%files devel
%defattr(-,root,root,-)
%doc clean_docs/*
%{_bindir}/motif-config
%{_bindir}/mxmkmf
%{_includedir}/Dt/
%{_includedir}/Mrm/
%{_includedir}/Xm/
%{_includedir}/uil/
%{_libdir}/lib*.so
# not shipped
#%{_mandir}/man1/ltversion*
%{_mandir}/man3/*
%{_datadir}/aclocal/ac_find_motif.m4
%{_datadir}/X11/config/*
%changelog
* Wed Aug 30 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-7
- add a patch such that motif-config honors libdir
* Wed Aug 30 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-6
- split out a clients package that contains xmbind and uil
* Wed Aug 23 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-5
- fix in Dt for x86_64, adapted from Dominik's patch
- don't hardcode /usr/include and /usr/lib
- add a Conflict for openmotif-devel
* Mon Aug 21 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-4
- BuildRequires fontconfig-devel
* Mon Aug 21 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-3
- BuildRequires libGLw-devel
- remove openmotif Obsoletes/Provides
- add versioning to the Obsoletes/Provides for lesstif-clients
* Sun Aug 20 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-2
- BuildRequires automake for the shipped autoconf macro
- add %%dist in release
- tie mwm to the lesstif version and release
* Sat Aug 19 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-1
- update to 0.95.0
- fix paths in mwm and mxmkmf
- adapt to modular X
* Fri Nov 26 2004 Thomas Woerner <twoerner at redhat.com> 0.93.36-7
- fixed CAN-2004-0687 (integer overflows) and CAN-2004-0688 (stack overflows)
in embedded Xpm library (#135080)
- latest Xpm patches: CAN-2004-0914 (#135081)
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Mar 17 2004 Karsten Hopp <karsten at redhat.de> 0.93.36-5.2
- remove XFree86 requirement, lesstif doesn't require an X server
to be installed on the same machine lesstif is installed on
(#118478)
* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Tue Dec 17 2002 Thomas Woerner <twoerner at redhat.com> 0.93.36-2
- renamed RPM tags in changelog
* Sat Nov 9 2002 Than Ngo <than at redhat.com> 0.93.36-1
- update to 0.93.36
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Jun 19 2002 Than Ngo <than at redhat.com> 0.93-18-4
- fixed bug #66939
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Wed Feb 27 2002 Than Ngo <than at redhat.com> 0.93-18-2
- rebuild
* Tue Feb 19 2002 Bernhard Rosenkraenzer <bero at redhat.com> 0.93.18-1
- 0.93.18
- Fix download URL
* Wed Jan 16 2002 Than Ngo <than at redhat.com> 0.93-15-4
- get rid of lesstif-mwm, use mwm in openmotif
- fix lesstif so that it can be installed with openmotif
- build only lesstif 1.x since openmotif is in 8.0
* Thu Nov 29 2001 Than Ngo <than at redhat.com> 0.93.15-2
- add missing header files
* Wed Nov 28 2001 Than Ngo <than at redhat.com> 0.93.15-1
- updated to 0.93.15
- fixed bug #56780, #56573, #56821
- sub package mwm
- libXbae and libXlt as separate packages
- disable lesstif 2.x
- clean up patch file for 0.93.15
* Mon Aug 13 2001 Than Ngo <than at redhat.com> 0.92-32-6
- fix bug #51595, #51411
* Wed Aug 8 2001 Than Ngo <than at redhat.com>
- owns some directories (bug #51154)
* Tue Jul 24 2001 Tim Powers <timp at redhat.com>
- fix dangling symlinks (/usr/X11R6/LessTif/Motif1.2/bin was missing from the filelist)
* Wed Jul 04 2001 Than Ngo <than at redhat.com> 0.92.32-3
- fix package group (Bug #47281)
- Copyright -> License
* Tue Jun 12 2001 Than Ngo <than at redhat.com>
- enable Motif 1.2 as default
* Sat May 02 2001 Than Ngo <than at redhat.com>
- update to 0.92.32
- enable Motif 2.1
- add conflict with openmotif
- add BuildRequires
* Mon Feb 05 2001 Than Ngo <than at redhat.com>
- Obsoletes Xbae, It's a part in lesstif and is up to date.
* Tue Dec 19 2000 Than Ngo <than at redhat.com>
- update to 0.92.0
- bzip2 sources
- add %%clean
* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt
* Thu Jul 13 2000 Than Ngo <than at redhat.de>
- fix permission of Xm and Mrm
* Wed Jul 12 2000 Than Ngo <than at redhat.de>
- rebuilt
* Wed May 31 2000 Than Ngo <than at redhat.de>
- update to 0.91.0
- fix conflict with openmotif
- remove part lesstif 2.0
- cleanup specfile
* Sun Apr 16 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.90.0
- handle gzip'ed man pages
* Tue Feb 1 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- fix a typo in files list (lib*.a, not lib.*a)
* Wed Jan 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.89.9
- Fix packaging issues (Bug #8607)
- bzip2 source to save space
- disable debugging
* Sun Nov 21 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 0.89.4
- some spec file cleanups
- handle RPM_OPT_FLAGS
* Thu Jul 2 1999 Tim Powers <timp at redhat.com>
- added 1.2-devel and 2.0-devel descriptions and file lists
- made default build 2.0
- changed decriptions for all packages
- added Requires: to 1.2-devel, 2.0-devel, clients, and mwm
- built for Powertools
* Thu Apr 30 1998 C. Scott Ananian <cananian at alumni.princeton.edu> (0.83+)
- Updated to lessdoc-current.
- Removes Lessdox package (integrated into lesstif)
* Tue Mar 31 1998 C. Scott Ananian <cananian at alumni.princeton.edu> (0.83+)
- Removed pedantic.patch
- Removed lesstif-M12 (Motif 1.2 wrapper)
- Reviewed installation and fixed %%files sections.
- Added patch to fix a bug which causes mozilla to crash.
- Added patch to fix the include prefix on install.
* Sun Jul 20 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl> (0.80-2)
- added to all %%doc %%attr macros (this allow build package from normal user
account),
- some simplification in %%files (%doc).
* Wed Jul 9 1997 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
- added using %%{PACKAGE_VERSION} macro in "Source:" and %files,
- added additional parameter "--enable-build-12" to runing configure,
- added %%posun and %%clear,
- in %%post and %%postun ldconfig is called as parameter with "-p"
(this feature is avalable in rpm >= 2.4.3 and you must have this
version and if you want recompile package from src.rpm you must have new
version rpm),
- added package lesstif-M12 simpe Motif 1.2 wrapper,
- simplified %%install section,
- added %%attr macros in %%files sections,
- added striping shared libraries,
- added URL field,
- added Lessdox - a html development documentation to lesstif-devel,
- added lesstif-0.80public-nopedantic.patch, this allow compile lesstif on
sparc by removing "-pedantic" from CFLAGS.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Aug 2006 18:10:35 -0000 1.1
+++ .cvsignore 30 Aug 2006 18:11:55 -0000 1.2
@@ -0,0 +1 @@
+lesstif-0.95.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Aug 2006 18:10:35 -0000 1.1
+++ sources 30 Aug 2006 18:11:55 -0000 1.2
@@ -0,0 +1 @@
+ab895165c149d7f95843c7584b1c7ad4 lesstif-0.95.0.tar.bz2
More information about the fedora-extras-commits
mailing list