Accepting request 63732 from Base:System

Accepted submit request 63732 from user coolo OBS-URL: https://build.opensuse.org/request/show/63732 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/autogen?expand=0&rev=17
2011-03-14 09:49:22 +00:00 · 2011-03-14 09:49:22 +00:00 · 4260943189
commit 4260943189
parent 0ba8f9338c
8 changed files with 47 additions and 57 deletions
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+<services>
+  <service name="download_url">
+    <param name="protocol">http</param>
+    <param name="host">ftp.gnu.org</param>
+    <param name="path">/gnu/autogen/5.11.8/autogen-5.11.8.tar.bz2</param>
+  </service>
+</services>
--- a/_service:download_url:autogen-5.11.8.tar.bz2
+++ b/_service:download_url:autogen-5.11.8.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f4c8fbbb072671141a9c499cb07b1274322117d3bd5e80e0bcf82dd5167c7c17
+size 1050419
--- a/autogen-5.11.1.tar.bz2
+++ b/autogen-5.11.1.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ea6de8c9e146defff5dd5883631d2a9baf2559486532f8cb7a9d819ff8122d8
-size 1029963
--- a/autogen-bash_path.patch
+++ b/autogen-bash_path.patch
@ -1,18 +0,0 @@
-diff -urN autoopts.orig/autoopts-config.in autoopts/autoopts-config.in
--- autoopts.orig/autoopts-config.in	2010-09-08 02:54:30.000000000 +0200
-+++ autoopts/autoopts-config.in	2010-09-11 05:54:15.000000000 +0200
-@@ -1,4 +1,4 @@
-#! /old-home/ROOT/usr/local/bin/bash
-+#! /bin/bash
- ## ---------------------------------------------------------------------
- ## autoopts-config.in -- Describe AutoOpts configuration
- ##
-diff -urN autoopts.orig/mk-autoopts-pc.in autoopts/mk-autoopts-pc.in
--- autoopts.orig/mk-autoopts-pc.in	2010-09-08 02:54:30.000000000 +0200
-+++ autoopts/mk-autoopts-pc.in	2010-09-11 05:54:07.000000000 +0200
-@@ -1,4 +1,4 @@
-#! /old-home/ROOT/usr/local/bin/bash
-+#! /bin/bash
- ## ---------------------------------------------------------------------
- ## mk-autoopts-pc.in -- Describe AutoOpts configuration
- ##
--- a/autogen-build_ldpath.patch
+++ b/autogen-build_ldpath.patch
@ -1,23 +1,13 @@
-diff -urN doc.orig/auto-opts.tpl doc/auto-opts.tpl
--- doc.orig/auto-opts.tpl	2010-07-10 20:08:57.000000000 +0200
-+++ doc/auto-opts.tpl	2010-09-11 05:22:09.000000000 +0200
-@@ -106,7 +106,7 @@
- 	_EOF_
- (
-   ${AGexe} -L${top_srcdir}/autoopts checkopt.def
-  opts=\"-o check -DTEST_CHECK_OPTS ${CFLAGS} ${INCLUDES}\"
-+  opts=\"-o check -DTEST_CHECK_OPTS ${CFLAGS} ${LDFLAGS} ${INCLUDES}\"
-   ${CC} -include ${top_builddir}/config.h ${opts} checkopt.c ${LIBS}
- ) > checkopt.err 2>&1
- 
-diff -urN doc.orig/mk-agen-texi-in doc/mk-agen-texi-in
--- doc.orig/mk-agen-texi-in	2010-09-08 02:35:48.000000000 +0200
-+++ doc/mk-agen-texi-in	2010-09-11 05:24:42.000000000 +0200
-@@ -90,8 +90,9 @@
+Index: doc/mk-agen-texi-in
+===================================================================
+--- doc/mk-agen-texi-in.orig	2011-02-03 18:07:54.000000000 +0100
+++ doc/mk-agen-texi-in	2011-03-09 14:35:50.638982611 +0100
+@@ -98,9 +98,9 @@ setup_exports()
   srcdir=`cd @srcdir@ ; pwd`
   PATH=${top_builddir}/columns:${PATH}
   timer=`expr @AG_TIMEOUT@ '*' 5`
-  d=`find ${top_builddir}/autoopts -type f -name libopts.a`
+-  d=`find ${top_builddir}/autoopts -type f -name libopts.a -print`
+-  test -f "$d" || die "Cannot locate libopts.a"
 -  LIBS="$d ${LIBS}"
 +  d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1`
 +  LIBS="-L`dirname \"$d\"` -lopts ${LIBS}"
@ -25,16 +15,7 @@ diff -urN doc.orig/mk-agen-texi-in doc/mk-agen-texi-in
 
   eval `egrep '^AG_[A-Z_]*' ${top_srcdir}/VERSION`
 
-@@ -100,7 +101,7 @@
-   GDexe=@GDexe@
-   CLexe=@CLexe@
- 
-  LIBS=${LIBS}\ `find ${top_builddir}/autoopts -name libopts.a -print`
-+  LIBS="${LIBS} `find ${top_builddir}/autoopts -name libopts.a -print`"
-   OPTIONS_DEF=${AGsrc}/opts.def
-   DIRECTIVESRC=${AGsrc}/defDirect.c
-   GETDEF_SRC=`
-@@ -211,7 +212,7 @@
+@@ -222,7 +222,7 @@ setup_exports
 sanity_check
 run_getdefs
 
@ -43,3 +24,16 @@ diff -urN doc.orig/mk-agen-texi-in doc/mk-agen-texi-in
 exec 3> ${tmp_dir}/ag.ini
 cat >&3 <<- _EOF_
 	timeout     ${timer}
+Index: autoopts/Makefile.am
+===================================================================
+--- autoopts/Makefile.am.orig	2011-03-08 01:35:12.000000000 +0100
+++ autoopts/Makefile.am	2011-03-09 14:50:16.858878038 +0100
+@@ -120,7 +120,7 @@ INST_SH                   = autoopts-con
+ 
+ man_MANS                  = $(INST_MANS)
+ m4data_DATA               = autoopts.m4
+-nobase_data_DATA          = $(INST_PKGCFG)
+pkgconfig_DATA          = $(INST_PKGCFG)
+ lib_LTLIBRARIES           = $(INST_LIBS)
+ nobase_include_HEADERS    = $(INST_HDRS)
+ bin_SCRIPTS               = $(INST_SH)
--- a/autogen-setfilename.patch
+++ b/autogen-setfilename.patch
@ -1,8 +1,10 @@
 Index: doc/autogen.texi
 ===================================================================
--- doc/autogen.texi.orig	2010-09-08 02:55:50.000000000 +0200
-+++ doc/autogen.texi	2010-09-09 12:46:29.602075564 +0200
-@@ -1,2 +1,3 @@
+--- doc/autogen.texi.orig	2011-03-08 01:36:31.000000000 +0100
+++ doc/autogen.texi	2011-03-09 14:33:06.355135652 +0100
+@@ -1,4 +1,5 @@
 \input texinfo
 +@setfilename autogen.info
- @include agdoc.texi
+ @ignore
+ \internalpagesizes{46\baselineskip}{6in}{-.25in}{-.25in}{\bindingoffset}{36pt}%
+ @end ignore
--- a/autogen.changes
+++ b/autogen.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  9 13:14:16 UTC 2011 - coolo@novell.com
+
+- update to 5.11.8:
+  * many, many changes - see NEWS and ChangeLog
+
 -------------------------------------------------------------------
 Mon Sep 13 12:01:49 CEST 2010 - pth@suse.de

--- a/autogen.spec
+++ b/autogen.spec
@ -20,15 +20,14 @@
 Name:           autogen
 BuildRequires:  guile-devel libxml2-devel
 Summary:        Automated Text File Generator
-Version:        5.11.1
+Version:        5.11.8
 Release:        1
 Group:          Development/Tools/Building
 License:        GPLv3+
 Url:            http://autogen.sourceforge.net/
-Source:         http://mesh.dl.sourceforge.net/sourceforge/autogen/%{name}-%{version}.tar.bz2
+Source:         http://ftp.gnu.org/gnu/autogen/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         autogen-setfilename.patch
 Patch1:         autogen-build_ldpath.patch
-Patch2:         autogen-bash_path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %{install_info_prereq}

@ -49,7 +48,6 @@ Authors:
 %setup -q
 %patch0
 %patch1
-%patch2

 %build
 autoreconf -fi
@ -73,10 +71,11 @@ rm -fr $RPM_BUILD_ROOT

 %files
 %defattr(-, root, root)
+%doc NEWS ChangeLog
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/lib*
-%{_libdir}/pkgconfig/autoopts.pc
+%{_libdir}/pkgconfig/*.pc
 %{_mandir}/man?/*.gz
 %{_datadir}/aclocal/*
 %{_datadir}/autogen