rpms/aalib/devel aalib-1.4rc5-x_libs.patch, NONE, 1.1 aalib-config-rpath.patch, 1.1, 1.2 aalib.spec, 1.18, 1.19
Garrick Staples (garrick)
fedora-extras-commits at redhat.com
Thu Feb 14 21:41:13 UTC 2008
Author: garrick
Update of /cvs/extras/rpms/aalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15278
Modified Files:
aalib-config-rpath.patch aalib.spec
Added Files:
aalib-1.4rc5-x_libs.patch
Log Message:
* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.4.0-0.14.rc5
- fix multilib conflicts by splitting out libs package and fix
timestamps and aalib-config
aalib-1.4rc5-x_libs.patch:
--- NEW FILE aalib-1.4rc5-x_libs.patch ---
--- aalib-1.4.0/configure.in.X_LIBS 2007-12-12 17:48:53.000000000 -0800
+++ aalib-1.4.0/configure.in 2007-12-12 17:49:11.000000000 -0800
@@ -103,8 +103,8 @@ AC_PATH_XTRA
if test "x$no_x" = x; then
x_driver=true
AC_DEFINE(X11_DRIVER)
- LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS -lX11"
- AALIB_LIBS="$AALIB_LIBS $X_EXTRA_LIBS $X_LIBS -lX11"
+ LIBS="$LIBS $X_EXTRA_LIBS -lX11"
+ AALIB_LIBS="$AALIB_LIBS $X_EXTRA_LIBS -lX11"
CFLAGS="$CFLAGS $X_CFLAGS"
fi
aalib-config-rpath.patch:
Index: aalib-config-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib-config-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aalib-config-rpath.patch 8 Nov 2004 04:00:19 -0000 1.1
+++ aalib-config-rpath.patch 14 Feb 2008 21:41:02 -0000 1.2
@@ -5,13 +5,13 @@
;;
@ENABLE_SHARED_TRUE@ --libs)
- at ENABLE_SHARED_TRUE@ libdirs="-L at libdir@ @AALIB_RLD_FLAGS@"
-+ at ENABLE_SHARED_TRUE@ libdirs="-L at libdir@"
++ at ENABLE_SHARED_TRUE@ libdirs=""
@ENABLE_SHARED_TRUE@ echo $libdirs @AALIB_LIBS@
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
- at ENABLE_STATIC_TRUE@ libdirs="-L at libdir@ @AALIB_RLD_FLAGS@"
-+ at ENABLE_STATIC_TRUE@ libdirs="-L at libdir@"
++ at ENABLE_STATIC_TRUE@ libdirs=""
@ENABLE_STATIC_TRUE@ echo $libdirs @AALIB_LIBS@
@ENABLE_STATIC_TRUE@ ;;
*)
Index: aalib.spec
===================================================================
RCS file: /cvs/extras/rpms/aalib/devel/aalib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- aalib.spec 16 Aug 2007 06:00:14 -0000 1.18
+++ aalib.spec 14 Feb 2008 21:41:02 -0000 1.19
@@ -3,7 +3,7 @@
Summary: ASCII art library
Name: aalib
Version: 1.4.0
-Release: 0.13.%{rc_subver}%{?dist}
+Release: 0.14.%{rc_subver}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://aa-project.sourceforge.net/aalib/
@@ -12,9 +12,10 @@
Patch1: aalib-config-rpath.patch
Patch2: aalib-1.4rc5-bug149361.patch
Patch3: aalib-1.4rc5-rpath.patch
-Patch4: aalib-ppc.patch
+Patch4: aalib-1.4rc5-x_libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel
+BuildRequires: autoconf libtool
%description
AA-lib is a low level gfx library just as many other libraries are. The
@@ -23,6 +24,13 @@
old-fashioned output methods with a powerful ASCII art renderer. The API
is designed to be similar to other graphics libraries.
+%package libs
+Summary: Library files for aalib
+Group: System/Libraries
+Requires: %{name} = %{version}-%{release}
+Obsoletes: aalib < 1.4.0-0.14
+%description libs
+This package contains library files for aalib.
%package devel
Summary: Development files for aalib
@@ -42,36 +50,32 @@
%patch1 -p0
%patch2 -p1 -b .bug149361
%patch3 -p1 -b .rpath
-%patch4 -p1 -b .ppc
-sed -i -e 's/^\(.*SHARED.*\)@AALIB_LIBS@/\1 -laa/' aalib-config.in
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch src/stamp-h.in
-touch src/config.h.in
-touch `find -name Makefile.in`
-
+%patch4 -p1 -b .x_libs
+# included libtool is too old, we need to rebuild
+autoreconf -v -f -i
%build
%configure --disable-static --with-curses-driver=yes --with-ncurses
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
rm -f $RPM_BUILD_ROOT{%{_libdir}/libaa.la,%{_infodir}/dir}
+# clean up multilib conflicts
+touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/aclocal/aalib.m4
+
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%post devel
/sbin/install-info %{_infodir}/libaa.info %{_infodir}/dir 2>/dev/null || :
@@ -90,9 +94,12 @@
%{_bindir}/aainfo
%{_bindir}/aasavefont
%{_bindir}/aatest
-%{_libdir}/libaa.so.*
%{_mandir}/man1/aafire.1*
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libaa.so.*
+
%files devel
%defattr(-,root,root,-)
%{_bindir}/aalib-config
@@ -103,6 +110,10 @@
%{_datadir}/aclocal/aalib.m4
%changelog
+* Thu Feb 14 2008 Garrick Staples <garrick at usc.edu> 1.4.0-0.14.rc5
+- fix multilib conflicts by splitting out libs package and fix
+ timestamps and aalib-config
+
* Wed Aug 15 2007 Garrick Staples <garrick at usc.edu> 1.4.0-0.13.rc5
- correct License: tag
More information about the fedora-extras-commits
mailing list