Hello community,
here is the log from the commit of package libXaw3d for openSUSE:Factory checked in at 2013-11-29 16:24:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXaw3d (Old)
and /work/SRC/openSUSE:Factory/.libXaw3d.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXaw3d"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libXaw3d/libXaw3d.changes 2013-11-26 06:12:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libXaw3d.new/libXaw3d.changes 2013-11-29 16:24:03.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Nov 26 13:38:57 UTC 2013 - jengelh@inai.de
+
+- Add obsoletes/provides xaw3d-devel because we are now
+ libXaw3d-devel
+
+-------------------------------------------------------------------
+Fri Nov 22 07:29:57 UTC 2013 - jengelh@inai.de
+
+- Redo xaw3d-elf.patch to modify Makefile.am instead and to also
+ include description
+- Remove hackish Provides: from .spec file that were only
+ for use with symlinks
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libXaw3d.spec ++++++
--- /var/tmp/diff_new_pack.0ZPodV/_old 2013-11-29 16:24:03.000000000 +0100
+++ /var/tmp/diff_new_pack.0ZPodV/_new 2013-11-29 16:24:03.000000000 +0100
@@ -37,16 +37,18 @@
Patch6: xaw3d-elf.patch
Patch7: xaw3d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires: autoconf >= 2.60, automake, libtool
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
+BuildRequires: libtool
BuildRequires: pkgconfig
+BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xmu)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xt)
-BuildRequires: xorg-x11-devel
%description
Xaw3d is a general-purpose replacement for the Athena toolkit which
@@ -62,12 +64,6 @@
%package -n libXaw3d6
Summary: The 3D Athena Widget Set
Group: System/Libraries
-Requires: libXaw3d8 = %version
-%ifarch ppc64 s390x x86_64 sparc64
-Provides: libXaw3d.so.6()(64bit)
-%else
-Provides: libXaw3d.so.6
-%endif
%description -n libXaw3d6
Xaw3d is a general-purpose replacement for the Athena toolkit which
@@ -76,12 +72,6 @@
%package -n libXaw3d7
Summary: The 3D Athena Widget Set
Group: System/Libraries
-Requires: libXaw3d8 = %version
-%ifarch ppc64 s390x x86_64 sparc64
-Provides: libXaw3d.so.7()(64bit)
-%else
-Provides: libXaw3d.so.7
-%endif
%description -n libXaw3d7
Xaw3d is a general-purpose replacement for the Athena toolkit which
@@ -114,6 +104,9 @@
%ifarch ppc64
Obsoletes: xaw3d-devel-64bit
%endif
+# O/P added for 13.2
+Provides: xaw3d-devel = %version-%release
+Obsoletes: xaw3d-devel < %version-%release
%description devel
Xaw3d is a general-purpose replacement for the Athena toolkit which
@@ -128,22 +121,6 @@
Requires: libXaw3d6 = %version
Requires: libXaw3d7 = %version
Requires: libXaw3d8 = %version
-# Not only for cakes -- the library is a lie, too.
-%ifarch ppc64 s390x x86_64 sparc64
-Provides: libXaw.so.6()(64bit)
-Provides: libXaw6.so.6()(64bit)
-Provides: libXaw.so.7()(64bit)
-Provides: libXaw7.so.7()(64bit)
-Provides: libXaw.so.8()(64bit)
-Provides: libXaw8.so.8()(64bit)
-%else
-Provides: libXaw.so.6
-Provides: libXaw6.so.6
-Provides: libXaw.so.7
-Provides: libXaw7.so.7
-Provides: libXaw.so.8
-Provides: libXaw8.so.8
-%endif
%description -n xaw3dd
Installation of this package will cause programs utilizing the Athena
@@ -157,6 +134,7 @@
%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1
%build
+autoreconf -fi
%configure --docdir=%_docdir/%name --disable-static \
--enable-internationalization \
--enable-multiplane-bitmaps \
@@ -171,21 +149,6 @@
make install DESTDIR=%buildroot
rm -vf %{buildroot}%{_libdir}/*.la
-for i in 6 7; do
- lib=libXaw3d.so.${i}.0.0
- rm -vf %{buildroot}%{_libdir}/${lib}
- install -m 0755 src/.mylibs/${lib} %{buildroot}%{_libdir}/
- ln -sf ${lib} %{buildroot}%{_libdir}/libXaw3d.so.${i}
-done
-mkdir -p %{buildroot}%{_libdir}/Xaw3d
-for i in 6 7 8; do
- lib=libXaw.so.${i}.0.0
- rm -vf %{buildroot}%{_libdir}/${lib}
- rm -vf %{buildroot}%{_libdir}/Xaw3d/${lib}
- install -m 0755 src/.mylibs/${lib} %{buildroot}%{_libdir}/Xaw3d/
- ln -sf ${lib} %{buildroot}%{_libdir}/Xaw3d/libXaw.so.${i}
-done
-
# Copy README here and then gobble it up via %%doc
mkdir -p %{buildroot}%_docdir/xaw3dd
cp %_sourcedir/README.SuSE %{buildroot}/%_docdir/xaw3dd/README.SUSE
++++++ xaw3d-elf.patch ++++++
--- /var/tmp/diff_new_pack.0ZPodV/_old 2013-11-29 16:24:03.000000000 +0100
+++ /var/tmp/diff_new_pack.0ZPodV/_new 2013-11-29 16:24:03.000000000 +0100
@@ -1,22 +1,63 @@
---- libXaw3d-1.6.2/src/Makefile.in
-+++ libXaw3d-1.6.2/src/Makefile.in 2013-10-29 15:45:03.514256258 +0000
-@@ -438,7 +438,18 @@ laygram.h: laygram.c
- $(MAKE) $(AM_MAKEFLAGS) laygram.c; \
- else :; fi
- libXaw3d.la: $(libXaw3d_la_OBJECTS) $(libXaw3d_la_DEPENDENCIES)
-- $(AM_V_CCLD)$(libXaw3d_la_LINK) -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mkdir -p .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 6:0:0 -no-undefined $(LDFLAGS) -o libXaw.la -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mv .libs/*.so* .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 6:0:0 -no-undefined $(LDFLAGS) -o $@ -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mv .libs/*.so* .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 7:0:0 -no-undefined $(LDFLAGS) -o libXaw.la -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mv .libs/*.so* .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 7:0:0 -no-undefined $(LDFLAGS) -o $@ -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mv .libs/*.so* .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 8:0:0 -no-undefined $(LDFLAGS) -o libXaw.la -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
-+ mv .libs/*.so* .mylibs
-+ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) -version-info 8:0:0 -no-undefined $(LDFLAGS) -o $@ -rpath $(libdir) $(libXaw3d_la_OBJECTS) $(libXaw3d_la_LIBADD) $(LIBS)
+From: Jan Engelhardt