Upgrade to autogen 5.12.

This commit is contained in:
Anthony Green 2011-11-25 11:27:29 -05:00
parent 4917bb9568
commit c0283514c2
5 changed files with 18 additions and 26 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
autogen-5.9.4.tar.bz2 autogen-5.9.4.tar.bz2
/autogen-5.12.tar.gz

View File

@ -1,6 +1,5 @@
diff -urNp autogen-5.9.4.orig/autoopts/autoopts-config.in autogen-5.9.4/autoopts/autoopts-config.in --- autoopts/autoopts-config.in.orig 2011-06-26 10:39:46.000000000 -0400
--- autogen-5.9.4.orig/autoopts/autoopts-config.in 2007-12-24 02:33:16.000000000 +0530 +++ autoopts/autoopts-config.in 2011-11-25 11:03:15.408677185 -0500
+++ autogen-5.9.4/autoopts/autoopts-config.in 2008-02-25 00:38:27.000000000 +0530
@@ -17,17 +17,17 @@ @@ -17,17 +17,17 @@
includedir="@includedir@" includedir="@includedir@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
@ -21,5 +20,5 @@ diff -urNp autogen-5.9.4.orig/autoopts/autoopts-config.in autogen-5.9.4/autoopts
- static_libs="${libdir}/libopts.a" - static_libs="${libdir}/libopts.a"
+ static_libs="" + static_libs=""
cflags="-I${includedir}" cflags="-I${includedir}"
test -n "${ldopts}" && ldflags="${ldopts}${libdir} ${ldflags}" case "${libdir}" in
test "${includedir}" = "/usr/include" && cflags="" /lib | /lib64 | /usr/lib | /usr/lib64 )

View File

@ -1,22 +1,18 @@
Summary: Automated text file generator Summary: Automated text file generator
Name: autogen Name: autogen
Version: 5.9.4 Version: 5.12
Release: 8%{?dist} Release: 1%{?dist}
# Some files are licensed under GPLv2+. # Some files are licensed under GPLv2+.
# We redistribute them under GPLv3+. # We redistribute them under GPLv3+.
License: GPLv3+ License: GPLv3+
Group: Development/Tools Group: Development/Tools
URL: http://www.gnu.org/software/autogen/ URL: http://www.gnu.org/software/autogen/
Source0: ftp://ftp.gnu.org/gnu/autogen/rel5.9.4/%{name}-%{version}.tar.bz2 Source0: ftp://ftp.gnu.org/gnu/autogen/rel5.12/%{name}-%{version}.tar.gz
Patch0: %{name}-%{version}-autoopts-config.patch Patch0: %{name}-%{version}-autoopts-config.patch
Patch1: %{name}-%{version}-pkgconfig.patch Patch1: %{name}-%{version}-pkgconfig.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Will be dropped in Fedora 10.
Provides: %{name}-manuals = %{version}-%{release}
Obsoletes: %{name}-manuals < 5.9.4-1
Requires: %{name}-libopts = %{version}-%{release} Requires: %{name}-libopts = %{version}-%{release}
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
@ -51,10 +47,6 @@ Summary: Development files for libopts
License: LGPLv3+ License: LGPLv3+
Group: Development/Libraries Group: Development/Libraries
# Will be dropped in Fedora 10.
Provides: %{name}-devel = %{version}-%{release}
Obsoletes: %{name}-devel < 5.9.4-1
Requires: automake Requires: automake
Requires: %{name}-libopts = %{version}-%{release} Requires: %{name}-libopts = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
@ -64,7 +56,7 @@ This package contains development files for libopts.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p0
%patch1 -p1 %patch1 -p1
%build %build
@ -80,7 +72,7 @@ cp %{_bindir}/libtool .
# Omit unused direct shared library dependencies. # Omit unused direct shared library dependencies.
sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool
make %{?_smp_mflags} make #%{?_smp_mflags}
%check %check
# make check # make check
@ -137,24 +129,21 @@ fi
%{_mandir}/man1/xml2ag.1.gz %{_mandir}/man1/xml2ag.1.gz
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/stdoptions.def %{_datadir}/%{name}/*
%{_datadir}/%{name}/*.tpl
%files libopts %files libopts
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc pkg/libopts/COPYING.mbsd %doc pkg/libopts/COPYING.mbsd
%doc pkg/libopts/COPYING.lgplv3 %doc pkg/libopts/COPYING.lgplv3
%{_libdir}/libguileopts.so.*
%{_libdir}/libopts.so.* %{_libdir}/libopts.so.*
%files libopts-devel %files libopts-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/autoopts-config %{_bindir}/autoopts-config
%{_datadir}/aclocal/autoopts.m4 %{_datadir}/aclocal/autoopts.m4
%{_datadir}/aclocal/liboptschk.m4 #%{_datadir}/aclocal/liboptschk.m4
%{_libdir}/libguileopts.so
%{_libdir}/libopts.so %{_libdir}/libopts.so
%{_libdir}/pkgconfig/autoopts.pc %{_datadir}/pkgconfig/autoopts.pc
%{_mandir}/man1/autoopts-config.1.gz %{_mandir}/man1/autoopts-config.1.gz
%{_mandir}/man3/* %{_mandir}/man3/*
@ -163,6 +152,9 @@ fi
%{_includedir}/autoopts/usage-txt.h %{_includedir}/autoopts/usage-txt.h
%changelog %changelog
* Fri Nov 25 2011 Anthony Green <green@redhat.com> - 5.12-1
- Upgrade.
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.4-8 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1 +1 @@
cd447b063675625b915546204f59db4b autogen-5.9.4.tar.bz2 6c6671b76021fb30dd43b0d5fdb7180b autogen-5.12.tar.gz