rpms/lesstif/devel lesstif-0.95.0-multilib.patch, NONE, 1.1 lesstif.spec, 1.17, 1.18 lesstif-motif-config-use_libdir.diff, 1.1, NONE

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Sun Oct 21 14:36:16 UTC 2007


Author: pertusus

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16759

Modified Files:
	lesstif.spec 
Added Files:
	lesstif-0.95.0-multilib.patch 
Removed Files:
	lesstif-motif-config-use_libdir.diff 
Log Message:
* Sun Oct 21 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-21
- remove libdir reference in motif-config, should fix multiarch conflict
  (#341841)


lesstif-0.95.0-multilib.patch:

--- NEW FILE lesstif-0.95.0-multilib.patch ---
diff -up lesstif-0.95.0/scripts/motif-config.in.multilib lesstif-0.95.0/scripts/motif-config.in
--- lesstif-0.95.0/scripts/motif-config.in.multilib	2005-01-14 20:36:00.000000000 +0100
+++ lesstif-0.95.0/scripts/motif-config.in	2007-10-21 13:52:43.000000000 +0200
@@ -2,14 +2,16 @@
 #
 # $Header: /cvsroot/lesstif/lesstif/scripts/motif-config.in,v 1.2 2005/01/14 19:36:00 dannybackx Exp $
 #
-L="@prefix@"
 XC="@X_CFLAGS@"
-XL="@X_LIBS@"
-XR="@XRENDER_LIBS@"
+X_PRE_LIBS="@X_PRE_LIBS@"
+X_LIBS="@X_LIBS@"
+X_EXTRA_LIBS="@X_EXTRA_LIBS@"
 V="@PACKAGE_NAME@ @PACKAGE_VERSION@"
 
-prefix=$L
-exec_prefix=$L
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+libdir="@libdir@"
+includedir="@includedir@"
 exec_prefix_set=no
 
 usage()
@@ -80,10 +82,10 @@ if test "$echo_exec_prefix" = "yes"; the
 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 ${X_LIBS} -lXm -lXt ${X_PRE_LIBS} -lX11 ${X_EXTRA_LIBS}"
 fi      
 


Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lesstif.spec	16 Sep 2007 16:45:50 -0000	1.17
+++ lesstif.spec	21 Oct 2007 14:35:42 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: LGPLv2+
 # in Xm-2.1/
 # some files are MIT
@@ -40,7 +40,7 @@
 # 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
+Patch1: lesstif-0.95.0-multilib.patch
 Patch2: lesstif-0.95.0-CAN-2005-0605.patch
 Patch3: lesstif-0.95.0-64bitcleanups.patch
 Patch4: lesstif-0.95.0-c++fix.patch
@@ -52,6 +52,9 @@
 Patch11: lesstif-0.95.0-accelkeys.patch
 Patch12: lesstif-0.95.0-attach-bottom-self.patch
 Patch13: lesstif-0.95.0-xtungrab-warning.patch
+# remove reference to libdir, since it is not necessary, and leads to
+# conflict in multiarch setups
+Patch14: lesstif-0.95.0-nolibdir.patch
 
 Url: http://www.lesstif.org/
 
@@ -151,6 +154,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1 -b .nolibdir
 
 # and pick up some fixes from Debian
 patch -p1 < debian/patches/020_xpmpipethrough.diff
@@ -227,13 +231,13 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man*/ltversion*
 
 # prepare docs
-rm -rf __fedora_clean_docs
-cp -a doc __fedora_clean_docs
-find __fedora_clean_docs -name 'Makefile*' -exec rm {} \;
+rm -rf __dist_clean_docs
+cp -a doc __dist_clean_docs
+find __dist_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
+   for file in __dist_clean_docs/lessdox/*/*.$suffix; do
       basefile=`basename $file .$suffix`
       dir=`dirname $file`
       touch -r $file $dir/$basefile.html
@@ -241,7 +245,7 @@
    done
 done
 # remove the empty directory
-rmdir __fedora_clean_docs/lessdox/functions
+rmdir __dist_clean_docs/lessdox/functions
 
 # remove host.def, it lives in the imake package
 rm $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
@@ -289,7 +293,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc  __fedora_clean_docs/*
+%doc  __dist_clean_docs/*
 %{_bindir}/motif-config
 %{_bindir}/mxmkmf
 %{_includedir}/Dt/
@@ -305,6 +309,10 @@
 
 
 %changelog
+* Sun Oct 21 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-21
+- remove libdir reference in motif-config, should fix multiarch conflict
+  (#341841)
+
 * Sun Sep 16 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-20
 - Correct patch XxxxProperty-64bit based on E. Sheldrake input (bz 284431)
 


--- lesstif-motif-config-use_libdir.diff DELETED ---




More information about the fedora-extras-commits mailing list