rpms/xbae/EL-5 xbae-4.60.4-multilib.patch, NONE, 1.1 xbae.spec, 1.4, 1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sun Dec 16 22:23:28 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/xbae/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21958
Modified Files:
xbae.spec
Added Files:
xbae-4.60.4-multilib.patch
Log Message:
sync with devel
xbae-4.60.4-multilib.patch:
--- NEW FILE xbae-4.60.4-multilib.patch ---
--- xbae-4.60.4/configure.multilib 2006-05-29 16:02:05.000000000 +0200
+++ xbae-4.60.4/configure 2007-05-12 13:44:11.000000000 +0200
@@ -22735,7 +22735,7 @@ fi
THE_DATE=`date +%F`
- ac_config_files="$ac_config_files Makefile include/Makefile include/Xbae/Makefile include/Xbae/patchlevel.h src/Makefile src/XbaeCaption.3 src/XbaeInput.3 src/XbaeMatrix.3 examples/Makefile examples/add/Makefile examples/caption/Makefile examples/choice/Makefile examples/colors/Makefile examples/draw/Makefile examples/dynamic/Makefile examples/fifteen/Makefile examples/input/Makefile examples/list/Makefile examples/matrix/Makefile examples/multibyte/Makefile examples/multifixed/Makefile examples/select-drag/Makefile examples/select-push/Makefile examples/tests/Makefile examples/traversal/Makefile examples/Mri/Makefile examples/builderXcessory/Makefile examples!
/builderXcessory/xbae.wml doc/Makefile doc/images/Makefile scripts/Makefile scripts/Xbae.spec"
+ ac_config_files="$ac_config_files Makefile include/Makefile include/Xbae/Makefile include/Xbae/patchlevel.h src/Makefile src/XbaeCaption.3 src/XbaeInput.3 src/XbaeMatrix.3 examples/Makefile examples/add/Makefile examples/caption/Makefile examples/choice/Makefile examples/colors/Makefile examples/draw/Makefile examples/dynamic/Makefile examples/fifteen/Makefile examples/input/Makefile examples/list/Makefile examples/matrix/Makefile examples/multibyte/Makefile examples/multifixed/Makefile examples/select-drag/Makefile examples/select-push/Makefile examples/tests/Makefile examples/traversal/Makefile examples/Mri/Makefile examples/builderXcessory/Makefile doc/Make!
file doc/images/Makefile scripts/Makefile scripts/Xbae.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -23403,7 +23403,6 @@ do
"examples/traversal/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/traversal/Makefile" ;;
"examples/Mri/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Mri/Makefile" ;;
"examples/builderXcessory/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/builderXcessory/Makefile" ;;
- "examples/builderXcessory/xbae.wml" ) CONFIG_FILES="$CONFIG_FILES examples/builderXcessory/xbae.wml" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"doc/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/images/Makefile" ;;
"scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
--- xbae-4.60.4/configure.in.multilib 2006-05-29 15:54:14.000000000 +0200
+++ xbae-4.60.4/configure.in 2007-05-12 13:44:17.000000000 +0200
@@ -275,7 +275,6 @@ examples/tests/Makefile \
examples/traversal/Makefile \
examples/Mri/Makefile \
examples/builderXcessory/Makefile \
-examples/builderXcessory/xbae.wml \
doc/Makefile \
doc/images/Makefile \
scripts/Makefile \
--- xbae-4.60.4/examples/builderXcessory/xbae.wml.in.multilib 2003-10-20 21:11:45.000000000 +0200
+++ xbae-4.60.4/examples/builderXcessory/xbae.wml.in 2007-05-12 13:45:47.000000000 +0200
@@ -368,7 +368,7 @@ Class XbaeMatrixClass : Widget
XtLiteral = "xbaeMatrixWidgetClass";
LiveObject = True;
SuperClass = "XmManager";
- LoadLibrary = "@prefix@/lib/libXbae.so";
+ LoadLibrary = "@libdir@/libXbae.so";
LinkLibrary = "-lXbae";
ConvenienceFunction = "XbaeCreateMatrix";
Resources {
@@ -482,7 +482,7 @@ Class XbaeCaptionClass : Widget
XtLiteral = "xbaeCaptionWidgetClass";
LiveObject = True;
SuperClass = "XmManager";
- LoadLibrary = "@prefix@/lib/libXbae.so";
+ LoadLibrary = "@libdir@/libXbae.so";
LinkLibrary = "-lXbae";
ConvenienceFunction = "XbaeCreateCaption";
Resources {
@@ -503,7 +503,7 @@ Class XbaeInputClass : Widget
XtLiteral = "xbaeInputWidgetClass";
LiveObject = True;
SuperClass = "XmText";
- LoadLibrary = "@prefix@/lib/libXbae.so";
+ LoadLibrary = "@libdir@/libXbae.so";
LinkLibrary = "-lXbae";
ConvenienceFunction = "XbaeCreateInput";
Resources {
--- xbae-4.60.4/examples/builderXcessory/Makefile.am.multilib 2002-11-23 23:14:00.000000000 +0100
+++ xbae-4.60.4/examples/builderXcessory/Makefile.am 2007-05-12 13:45:47.000000000 +0200
@@ -7,7 +7,7 @@ EXTRA_DIST= \
XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
local.cat \
xbae.wml \
- xbae_ctrl.tcl
+ xbae_ctrl.tcl xbae.wml.in
examplesdir = $(datadir)/Xbae/examples/builderXcessory
examples_DATA = \
@@ -16,3 +16,6 @@ examples_DATA = \
local.cat \
xbae.wml \
xbae_ctrl.tcl
+
+xbae.wml: xbae.wml.in ../../config.status
+ sed -e "s%[@]libdir[@]%$(libdir)%" $< > xbae.wml
--- xbae-4.60.4/examples/builderXcessory/Makefile.in.multilib 2006-05-29 16:02:07.000000000 +0200
+++ xbae-4.60.4/examples/builderXcessory/Makefile.in 2007-05-12 13:45:47.000000000 +0200
@@ -37,8 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = examples/builderXcessory
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/xbae.wml.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/ac_find_motif.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
@@ -46,7 +45,6 @@ am__configure_deps = $(am__aclocal_m4_de
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/XbaeConfig.h
-CONFIG_CLEAN_FILES = xbae.wml
depcomp =
am__depfiles_maybe =
SOURCES =
@@ -211,7 +209,7 @@ EXTRA_DIST = \
XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
local.cat \
xbae.wml \
- xbae_ctrl.tcl
+ xbae_ctrl.tcl xbae.wml.in
examplesdir = $(datadir)/Xbae/examples/builderXcessory
examples_DATA = \
@@ -253,8 +251,6 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-xbae.wml: $(top_builddir)/config.status $(srcdir)/xbae.wml.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
-rm -f *.lo
@@ -404,6 +400,9 @@ uninstall-am: uninstall-examplesDATA uni
uninstall uninstall-am uninstall-examplesDATA \
uninstall-info-am
+
+xbae.wml: xbae.wml.in ../../config.status
+ sed -e "s%[@]libdir[@]%$(libdir)%" $< > xbae.wml
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: xbae.spec
===================================================================
RCS file: /cvs/extras/rpms/xbae/EL-5/xbae.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xbae.spec 10 Dec 2006 11:38:54 -0000 1.4
+++ xbae.spec 16 Dec 2007 22:22:48 -0000 1.5
@@ -1,35 +1,56 @@
+# xbae wasn't in fedora with monolithic X (fedora < 5), but it
+# could be possible to do the needed conditionals
+# motif switched to lesstif in fedora 6 and fedora extras 5 is not
+# maintained anymore, it could be possible to add the conditionals
+%if 0%{?rhel}
+%if "%rhel" <= "4"
+%define monolithic_X 1
+%endif
+%endif
+
Name: xbae
Version: 4.60.4
-Release: 5%{?dist}
+Release: 8%{?dist}
Summary: Motif matrix, caption and text input widgets
Group: System Environment/Libraries
-License: BSD
+# all the files are covered by the MIT license, except DebugUtil.c LGPLv2+
+License: LGPLv2+
URL: http://xbae.sourceforge.net/
-Source0: http://ovh.dl.sourceforge.net/sourceforge/xbae/xbae-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/xbae/xbae-%{version}.tar.gz
# this fixes the link of the example using Wcl, it shouldn't be of use
# now that Wcl isn't buildrequired, but it is still better.
Patch0: xbae-link_Mri_with_lXmp.diff
+Patch1: xbae-4.60.4-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?monolithic_X}
+# this could certainly be left out since it is an openmotif-devel
+# dependency, but it is also a direct dependency
+BuildRequires: xorg-x11-devel
+%else
# libXp-devel and libXext-devel are required by openmotif-devel or
# lesstif-devel
-# Wcl-devel is only needed by an example, which adds the Xbae widgets to Wcl
BuildRequires: libXpm-devel
-#BuildRequires: openmotif-devel
+# needed for examples
+BuildRequires: libXmu-devel
+%endif
+
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+%else
BuildRequires: lesstif-devel
+# to be sure that we link against lesstif even if openmotif provides the same
+# soname
+Requires: lesstif
+%endif
# Wcl-devel should only needed by an example, which adds the Xbae widgets
# to Wcl, so there is no real need for it.
#BuildRequires: Wcl-devel
-# needed for examples
-BuildRequires: libXmu-devel
# name with capitalized X was used for the xbae package shipped up to FC-1
Provides: Xbae = %{version}-%{release}
Obsoletes: Xbae < %{version}-%{release}
-# to be sure that we link against lesstif even if openmotif provides the same
-# soname
-Requires: lesstif
%description
XbaeMatrix is a free Motif(R) table widget (also compatible with the free
@@ -49,9 +70,16 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-#Requires: openmotif-devel
+%if 0%{?rhel}
+Requires: openmotif-devel
+%else
Requires: lesstif-devel
+%endif
+%if 0%{?monolithic_X}
+Requires: xorg-x11-devel
+%else
Requires: libXpm-devel
+%endif
# for the aclocal directory
Requires: automake
Provides: Xbae-devel = %{version}-%{release}
@@ -65,6 +93,7 @@
%prep
%setup -q
%patch -p1
+%patch1 -p1 -b .multilib
%build
@@ -74,29 +103,55 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} INSTALL='install -p'
+# fix timestamps for configure generated man pages
+pushd src
+for file in XbaeCaption.3 XbaeInput.3 XbaeMatrix.3; do
+ touch -r $file.in $RPM_BUILD_ROOT%{_mandir}/man3/$file
+done
+popd
+# and include file
+touch -r NEWS $RPM_BUILD_ROOT%{_includedir}/Xbae/patchlevel.h
# the configure test doesn't find the aclocal dir, so we install
# the .m4 file by hand
install -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
-install -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
+install -p -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
+
+rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+# prepare the main docs
+# Use systematically __dist_* to avoid directory name clash.
+rm -rf __dist_Xbae-docs
+mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __dist_Xbae-docs
+# remove duplicate files already in %%doc
+rm __dist_Xbae-docs/README
+rm __dist_Xbae-docs/NEWS
+# examples for builderXcessory are arch specific, this avoids clash of
+# doc files between arches
+mv __dist_Xbae-docs/examples/builderXcessory __dist_Xbae-docs/examples/builderXcessory-%{_arch}
+
+# first clean examples
+rm -rf __dist_examples
+cp -pr examples __dist_examples
+make -C __dist_examples clean
+find __dist_examples -name '*akefile*' -exec rm {} \;
+rm __dist_examples/extest
+rm __dist_examples/testall
+
+# the builderXcessory directory is duplicated in the main doc and in the
+# example code. The master dir is considered to be in the main doc.
+# the README is better with the main examples doc, not in code examples
+mv __dist_examples/builderXcessory/README __dist_Xbae-docs/examples/builderXcessory-%{_arch}/
+# remove the duplicate dir and replace it with a link
+rm -rf __dist_examples/builderXcessory/
+ln -s ../examples/builderXcessory-%{_arch}/ __dist_examples/builderXcessory-%{_arch}
+
+# then put the examples in a code_examples directory
+rm -rf __dist_code_examples
+mkdir __dist_code_examples
+mv __dist_examples __dist_code_examples/code_examples
-mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ Xbae-docs
-# remove duplicate files
-rm Xbae-docs/README
-rm Xbae-docs/NEWS
-
-# clean the examples
-make -C examples clean
-cp -pr examples code_examples
-find code_examples -name '*akefile*' -exec rm {} \;
-rm code_examples/extest
-rm code_examples/testall
-mv code_examples/builderXcessory/README Xbae-docs/examples/builderXcessory/
-rm -rf code_examples/builderXcessory/
-ln -s ../examples/builderXcessory/ code_examples/builderXcessory
%clean
rm -rf $RPM_BUILD_ROOT
@@ -110,17 +165,28 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog NEWS COPYING README
-%{_libdir}/*.so.*
+%{_libdir}/libXbae.so.*
%files devel
%defattr(-,root,root,-)
-%doc Xbae-docs/* code_examples
+%doc __dist_Xbae-docs/* __dist_code_examples/code_examples
%{_includedir}/Xbae/
-%{_libdir}/*.so
+%{_libdir}/libXbae.so
%{_mandir}/man*/Xbae*
%{_datadir}/aclocal/*
+
%changelog
+* Wed Aug 22 2007 Patrice Dumas <pertusus at free.fr> 4.60.4-8
+- fix license and source url
+
+* Wed Jul 25 2007 Patrice Dumas <pertusus at free.fr> 4.60.4-7
+- add rhel conditionals
+
+* Sat May 12 2007 Patrice Dumas <pertusus at free.fr> 4.60.4-6
+- keep timestamps
+- examples/builderXcessory is arch specific
+
* Sun Dec 10 2006 Patrice Dumas <pertusus at free.fr> 4.60.4-5
- Requires automake is for -devel (#219047)
More information about the fedora-extras-commits
mailing list