- Taking over as maintainer since Anvil has other priorities
- Long long due rebuild with new gcc for FC-5 (bug 185870)
- Add %{?dist} tag
- Make release field comply with the Package Naming guidelines for pre
releases. Luckily according to rpm 8 > rc5 so this can be done.
- Fix some rpmlint warnings
- Fix (remove) use of rpath
This commit is contained in:
parent
cff1fc1d5e
commit
d1b5828a9d
2 changed files with 76 additions and 24 deletions
40
aalib-1.4rc5-rpath.patch
Normal file
40
aalib-1.4rc5-rpath.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
--- aalib-1.4.0/configure.in~ 2006-07-23 09:29:19.000000000 +0200
|
||||
+++ aalib-1.4.0/configure.in 2006-07-23 09:29:19.000000000 +0200
|
||||
@@ -371,17 +371,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# Set runtime shared library paths as needed
|
||||
-
|
||||
-if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
|
||||
- AALIB_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
|
||||
-fi
|
||||
-
|
||||
-if test $ARCH = solaris; then
|
||||
- AALIB_RLD_FLAGS="-R\${exec_prefix}/lib"
|
||||
-fi
|
||||
-
|
||||
-
|
||||
dnl Expand the cflags and libraries needed by apps using AALIB
|
||||
AC_SUBST(AALIB_CFLAGS)
|
||||
AC_SUBST(AALIB_LIBS)
|
||||
--- aalib-1.4.0/configure~ 2006-07-23 09:29:18.000000000 +0200
|
||||
+++ aalib-1.4.0/configure 2006-07-23 09:29:18.000000000 +0200
|
||||
@@ -4313,17 +4313,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# Set runtime shared library paths as needed
|
||||
-
|
||||
-if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
|
||||
- AALIB_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
|
||||
-fi
|
||||
-
|
||||
-if test $ARCH = solaris; then
|
||||
- AALIB_RLD_FLAGS="-R\${exec_prefix}/lib"
|
||||
-fi
|
||||
-
|
||||
-
|
||||
|
||||
|
||||
|
||||
60
aalib.spec
60
aalib.spec
|
|
@ -1,27 +1,19 @@
|
|||
%define rc_subver rc5
|
||||
|
||||
Summary: An ASCII art library.
|
||||
Name: aalib
|
||||
Version: 1.4.0
|
||||
Release: 0.8.%{rc_subver}%{?dist}
|
||||
|
||||
License: LGPL
|
||||
Group: System Environment/Libraries
|
||||
URL: http://aa-project.sourceforge.net/aalib/
|
||||
Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz
|
||||
Patch0: %{name}-aclocal.patch
|
||||
Patch1: %{name}-config-rpath.patch
|
||||
Patch2: aalib-1.4rc5-bug149361.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: slang-devel libXt-devel gpm-devel
|
||||
|
||||
%package devel
|
||||
Summary: aalib development files
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(postun): /sbin/install-info
|
||||
%define rc_subver rc5
|
||||
|
||||
Summary: ASCII art library
|
||||
Name: aalib
|
||||
Version: 1.4.0
|
||||
Release: 0.8.%{rc_subver}%{?dist}
|
||||
License: LGPL
|
||||
Group: System Environment/Libraries
|
||||
URL: http://aa-project.sourceforge.net/aalib/
|
||||
Source0: http://download.sourceforge.net/aa-project/%{name}-1.4%{rc_subver}.tar.gz
|
||||
Patch0: aalib-aclocal.patch
|
||||
Patch1: aalib-config-rpath.patch
|
||||
Patch2: aalib-1.4rc5-bug149361.patch
|
||||
Patch3: aalib-1.4rc5-rpath.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: slang-devel libXt-devel gpm-devel
|
||||
|
||||
%description
|
||||
AA-lib is a low level gfx library just as many other libraries are. The
|
||||
|
|
@ -30,6 +22,14 @@ fact, there is no graphical output possible. AA-lib replaces those
|
|||
old-fashioned output methods with a powerful ASCII art renderer. The API
|
||||
is designed to be similar to other graphics libraries.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development files for aalib
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(postun): /sbin/install-info
|
||||
|
||||
%description devel
|
||||
This package contains header files and other files needed to develop
|
||||
with aalib.
|
||||
|
|
@ -40,11 +40,21 @@ with aalib.
|
|||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p1 -b .bug149361
|
||||
%patch3 -p1 -b .rpath
|
||||
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`
|
||||
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
# 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}
|
||||
|
||||
|
||||
|
|
@ -97,6 +107,8 @@ fi
|
|||
- Add %%{?dist} tag
|
||||
- Make release field comply with the Package Naming guidelines for
|
||||
pre releases. Luckily according to rpm 8 > rc5 so this can be done.
|
||||
- Fix some rpmlint warnings
|
||||
- Fix (remove) use of rpath
|
||||
|
||||
* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.4.0-0.rc5.7
|
||||
- Fix modular X dependencies.
|
||||
|
|
@ -127,7 +139,7 @@ fi
|
|||
* Fri Jul 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.4.0-0.fdr.0.9.rc5
|
||||
- Fix underquoted definition in aalib.m4 to appease aclocal >= 1.8.
|
||||
- Avoid rpath in aalib-config.
|
||||
- Split Requires(post,postun) into two to work around a rpm bug.
|
||||
- Split Requires for post and postun into two to work around a rpm bug.
|
||||
- Other minor specfile improvements.
|
||||
|
||||
* Thu Aug 21 2003 Dams <anvil[AT]livna.org> 0:1.4.0-0.fdr.0.8.rc5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue