- remove unnecessary link bloat from aalib-config

- libs package doesn't need to require base package
- move docs to libs package
epel9
Garrick Staples 17 years ago
parent cfbf879133
commit 66f1a7efae

@ -0,0 +1,17 @@
--- aalib-config.in.libflag 2008-03-24 20:42:47.000000000 -0700
+++ aalib-config.in 2008-03-24 20:44:24.000000000 -0700
@@ -49,12 +49,12 @@ while test $# -gt 0; do
;;
@ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ libdirs=""
-@ENABLE_SHARED_TRUE@ echo $libdirs @AALIB_LIBS@
+@ENABLE_SHARED_TRUE@ echo $libdirs -laa
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@ENABLE_STATIC_TRUE@ libdirs=""
-@ENABLE_STATIC_TRUE@ echo $libdirs @AALIB_LIBS@
+@ENABLE_STATIC_TRUE@ echo $libdirs -laa
@ENABLE_STATIC_TRUE@ ;;
*)
echo "${usage}" 1>&2

@ -3,7 +3,7 @@
Summary: ASCII art library Summary: ASCII art library
Name: aalib Name: aalib
Version: 1.4.0 Version: 1.4.0
Release: 0.14.%{rc_subver}%{?dist} Release: 0.15.%{rc_subver}%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://aa-project.sourceforge.net/aalib/ URL: http://aa-project.sourceforge.net/aalib/
@ -13,6 +13,7 @@ Patch1: aalib-config-rpath.patch
Patch2: aalib-1.4rc5-bug149361.patch Patch2: aalib-1.4rc5-bug149361.patch
Patch3: aalib-1.4rc5-rpath.patch Patch3: aalib-1.4rc5-rpath.patch
Patch4: aalib-1.4rc5-x_libs.patch Patch4: aalib-1.4rc5-x_libs.patch
Patch5: aalib-1.4rc5-libflag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel BuildRequires: slang-devel libXt-devel gpm-devel ncurses-devel
BuildRequires: autoconf libtool BuildRequires: autoconf libtool
@ -27,7 +28,6 @@ is designed to be similar to other graphics libraries.
%package libs %package libs
Summary: Library files for aalib Summary: Library files for aalib
Group: System/Libraries Group: System/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: aalib < 1.4.0-0.14 Obsoletes: aalib < 1.4.0-0.14
%description libs %description libs
This package contains library files for aalib. This package contains library files for aalib.
@ -35,7 +35,7 @@ This package contains library files for aalib.
%package devel %package devel
Summary: Development files for aalib Summary: Development files for aalib
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info Requires(postun): /sbin/install-info
@ -51,6 +51,7 @@ with aalib.
%patch2 -p1 -b .bug149361 %patch2 -p1 -b .bug149361
%patch3 -p1 -b .rpath %patch3 -p1 -b .rpath
%patch4 -p1 -b .x_libs %patch4 -p1 -b .x_libs
%patch5 -p0 -b .libflag
# included libtool is too old, we need to rebuild # included libtool is too old, we need to rebuild
autoreconf -v -f -i autoreconf -v -f -i
@ -89,7 +90,6 @@ fi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README COPYING ChangeLog NEWS
%{_bindir}/aafire %{_bindir}/aafire
%{_bindir}/aainfo %{_bindir}/aainfo
%{_bindir}/aasavefont %{_bindir}/aasavefont
@ -98,6 +98,7 @@ fi
%files libs %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README COPYING ChangeLog NEWS
%{_libdir}/libaa.so.* %{_libdir}/libaa.so.*
%files devel %files devel
@ -110,6 +111,11 @@ fi
%{_datadir}/aclocal/aalib.m4 %{_datadir}/aclocal/aalib.m4
%changelog %changelog
* Mon Mar 24 2008 Garrick Staples <garrick@usc.edu> 1.4.0-0.15.rc5
- remove unnecessary link bloat from aalib-config
- libs package doesn't need to require base package
- move docs to libs package
* Thu Feb 14 2008 Garrick Staples <garrick@usc.edu> 1.4.0-0.14.rc5 * Thu Feb 14 2008 Garrick Staples <garrick@usc.edu> 1.4.0-0.14.rc5
- fix multilib conflicts by splitting out libs package and fix - fix multilib conflicts by splitting out libs package and fix
timestamps and aalib-config timestamps and aalib-config

Loading…
Cancel
Save