Accepting request 288519 from Base:System

- Remove upsteamed patch:
  * autoopts-remove-stupid-set-e.patch
  * agen5-testsuite.patch
- Cleanup spec file with spec-cleaner
- Use url for source
- Add gpg signature
- Update to 5.18.4 (forwarded request 288512 from pluskalm)

OBS-URL: https://build.opensuse.org/request/show/288519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autogen?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2015-03-03 10:15:40 +00:00 committed by Git OBS Bridge
commit 13b7b2f24e
9 changed files with 84 additions and 55 deletions

View File

@ -1,13 +0,0 @@
Index: autogen-5.18.3/agen5/test/debug.test
===================================================================
--- autogen-5.18.3.orig/agen5/test/debug.test
+++ autogen-5.18.3/agen5/test/debug.test
@@ -155,7 +155,7 @@ fi
run_ag x1 ${trace_args} ${testname}.def || failure AutoGen failed
${SED} \
-e 's@from file .*agInit.*@from file agInit.c line XXX:@' \
- -e '/ from debug\.def/s/ at 0x.*//' \
+ -e '/ from debug\.def/s/ at .*//' \
-e '/Called ag_scm_for_index/d' \
-e '/^AutoGen /s/[0-9][0-9]* starts:.*/NNNN starts:/' \
-e 's/Guile Library Version .*/Guile Library Version X.X.X/' \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca94bfe0a78b4664f1c9f4e34e14ad545eb8eec4c24277c2d34ae9f30043c5c3
size 1011676

3
autogen-5.18.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b
size 1017936

View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iEYEABECAAYFAlQCD+MACgkQ2SBMtb+/AiEFWQCgvOLX9VQi6Yuni2cI9nmeIElP
2JcAoJH3XTUXdLujuZvjK6NsPvORaqMI
=KeoS
-----END PGP SIGNATURE-----

View File

@ -7,7 +7,7 @@ Index: autoopts/Makefile.am
===================================================================
--- autoopts/Makefile.am.orig
+++ autoopts/Makefile.am
@@ -159,7 +159,7 @@ INST_SH = autoopts-con
@@ -164,7 +164,7 @@ INST_SH = autoopts-con
man_MANS = $(INST_MANS)
m4data_DATA = autoopts.m4

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Mar 2 15:38:31 UTC 2015 - mpluskal@suse.com
- Remove upsteamed patch:
* autoopts-remove-stupid-set-e.patch
* agen5-testsuite.patch
- Cleanup spec file with spec-cleaner
- Use url for source
- Add gpg signature
- Update to 5.18.4
* Do Not Edit (dne) warning: the default of printing a date in
the warning has now changed to not doing so. The "-d" option
to suppress the date is now deprecated (ignored). A new
option, "-D" will cause the date to be included. The
environment variable, "AUTOGEN_DNE_DATE" overrides everything.
* The RETURN function was not completely implemented and only
partially worked. It is working now.
* optionPrintVersionAndReturn() is a new function for applications
that wish to extend the behavior of the "--version" option.
* mdoc and man pages have been greatly improved.
* libopts tear-off library used stdnoreturn.h and now includes
infrastructure for systems deficient in that area
* new function: insert-file It will simply insert the contents
of a file (or list of files) into the output stream.
-------------------------------------------------------------------
Fri Jul 4 12:03:09 UTC 2014 - schwab@suse.de

29
autogen.keyring Normal file
View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
mQGiBEp90uARBACJ5Cegm9cH/boJ9Mknwa3g7IqXRN+ZCNfPfii/iFTfeD83eMJY
7VZqoV7Nvfzaabm0ZEtYC0lv+Bf8Mt5ZSSOL/d9ezxo1BCS85q4Ge6wUBK3hopaA
SYkxzR36BeOBnP5lmvTt5XYa6C/bgUDMgCMKFD/SQtS7xH7cpP/strcGpwCg9V5i
kybrutX5e171uW6wvLRvynEEAIjSDFqgpc/Ck0LES+rm0UBGa+SvLYg2XX1vuTQY
jX45VK/0rAhw6xt1rB/zbCEipzDlfe38BwRE2oQYKUGSd2U0XvokWOlfYPbM7jDK
B6gpLUCb4N/HTrTkHC8s/fgzxjXwREdIVKxCDso5BERIZjYkNBDz/5JjlHHRfvNw
66paBACHT18nLu+2+k0M4Zu2ttVDKvPTLF1pSoxZbHqrdZOiFSEsFN/xONB8DAkH
mSib2m5AVg9v0nPby7J86RPATlRfnFdweh9XF/jVZiV73b4UqTRTDRlb4vJDMi2o
sa2u+oy4OEcXrgwuiG1MFpI27ICVNSJku8VdMMTOX31nZxwCi7QaQnJ1Y2UgS29y
YiA8YmtvcmJAZ251Lm9yZz6IYAQTEQIAIAUCSn3S4AIbAwYLCQgHAwIEFQIIAwQW
AgMBAh4BAheAAAoJENkgTLW/vwIh+CMAnAqhni9fdxgMdku6daaTCmtQ8TotAKC8
wcDXHz8C7lC3BBokh0pH24MPbLkCDQRKfdLgEAgA2DC8De+04mpiTaZGGmdLI+6m
azmfZfU8sBSlVRZl4DUGpj4mN27jeRJYwIzAGoywO+MtZbQkRD/VfkdmngV7DIHu
sPwg/NuIYIM9Or2UeJ6vd4ouMZXTYTxtSxmG5TisYeAu9yTMkuA3OWK3egLT9yeq
DDXJ/2r+IaSHyZLNVRYUtLBX7ZW/J4iDY6vqzO+fEP1hpsxcqIU0D08lfXioMIRX
Pxd9/XqzVj+bbcTdPrtyKlTDz5yUvCdGHlTrECeYE6tZ3wZMiGLJK4vKuha56qDD
cKI+2kuksXuqNszq74jm2Ui9BcDSPrMFxQSiEKNuYzaW8tmdDd/c+0WlcFsJIwAD
BQf+KdC+CTv7lBaoG06S4G1KnLwzFgCjiRT23cREl9T6RO9m6/rJWH6CZd+BaRAJ
DtdHGfrx57Lnq70E8H5vuXYXL0L/WEZtmO3XOPqoaPU16jOsGlKo9iqQK7teT4Rq
RNeAFWy2nNTfRfoQ/0FnBRpZ9g/A82jSJwECyCxMs4qzxYPamixrrh9H5GxZYiHf
6vlYc9jwPIJ1Hm8iW1eSPvVHBSsw6Qxf+78YVrO9ZhQshKYBzA0iPGkeaYEbaSmd
MMjGf5rcQJLJZDuwSZ2HNQySM/pjij/lGpmqKns3+KkfcTFc3QJw9lGlyADIbwIO
n81H232bEZjbA26Y0TUoxe4tXYhJBBgRAgAJBQJKfdLgAhsMAAoJENkgTLW/vwIh
ZZsAmgO2P7NTfgrqE8TCiOCn4rIBxvpsAJ9C2rP48aExYYPkuNr/C16xOKP1Rw==
=TSVX
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package autogen
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,24 +17,25 @@
Name: autogen
Version: 5.18.4
Release: 0
Summary: Automated Text File Generator
License: GPL-3.0+
Group: Development/Tools/Building
Url: http://autogen.sourceforge.net/
Source0: https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz.sig
Source2: %{name}.keyring
Patch1: autogen-build_ldpath.patch
BuildRequires: fdupes
BuildRequires: guile-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: makeinfo
BuildRequires: pkg-config
BuildRequires: xz
Summary: Automated Text File Generator
License: GPL-3.0+
Group: Development/Tools/Building
Version: 5.18.3
Release: 0
Url: http://autogen.sourceforge.net/
Source: %{name}-%{version}.tar.xz
Patch1: autogen-build_ldpath.patch
Patch2: autoopts-remove-stupid-set-e.patch
Patch3: agen5-testsuite.patch
Requires(pre): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %{install_info_prereq}
%description
AutoGen is a tool designed for generating program files that contain
@ -46,19 +47,20 @@ that must be kept synchronized in parallel tables.
%prep
%setup -q
%patch1
%patch2 -p1
%patch3 -p1
%build
autoreconf -fi
%configure --disable-static --with-pic
%configure \
--disable-static \
--with-pic
make %{?_smp_mflags}
%install
%makeinstall
make DESTDIR=%{buildroot} install %{?_smp_mflags}
%fdupes -s %{buildroot}%{_datadir}
%check
make check
make %{?_smp_mflags} check
%post
/sbin/ldconfig

View File

@ -1,21 +0,0 @@
Index: autogen-5.18.3/autoopts/mk-tpl-config.sh
===================================================================
--- autogen-5.18.3.orig/autoopts/mk-tpl-config.sh
+++ autogen-5.18.3/autoopts/mk-tpl-config.sh
@@ -31,7 +31,6 @@ die() {
init() {
PS4='>tpc-${FUNCNAME}> '
- set -e
progpid=$$
prog=`basename $0`
progdir=`\cd \`dirname $0\` >/dev/null ; pwd`
@@ -200,7 +199,7 @@ fix_guile() {
cd ${builddir}
find_libguiledir "${LGCFLAGS}"
- list=`set +e ; exec 2>/dev/null
+ list=`exec 2>/dev/null
find ${libguiledir}/libguile* -type f | \
xargs grep -l -E '\<noreturn\>'`