- updated to 2.23

- removed obsolete am patch

diff --git a/gengetopt-am.patch b/gengetopt-am.patch
deleted file mode 100644 (file)
index fb7553a..0000000
--- a/gengetopt-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gengetopt-2.22.6/src/Makefile.am.orig      2012-11-02 14:26:54.000000000 +0100
-+++ gengetopt-2.22.6/src/Makefile.am   2018-05-22 17:14:37.828404404 +0200
-@@ -51,7 +51,7 @@
-       @LTLIBOBJS@ \
-       skels/libgen.la
- 
--LDADD = $(top_builddir)/src/libgengetopt.la
-+LDADD = libgengetopt.la
- 
- EXTRA_DIST = parser.h argsdef.h gengetopt.h ggos.h gm.h gnugetopt.h \
- cmdline.c cmdline.h \

diff --git a/gengetopt-info.patch b/gengetopt-info.patch
index 3c09a01c1ca0b3b1ea1717b17e0e61b6cfbb83a2..2dfb45ff192599a9b92e43530dce4a99fc33f4b2 100644 (file)
--- a/gengetopt-info.patch
+++ b/gengetopt-info.patch
@@ -1,13 +1,13 @@
---- gengetopt-2.22.6/doc/gengetopt.texinfo.orig        2012-11-02 18:43:24.000000000 +0100
-+++ gengetopt-2.22.6/doc/gengetopt.texinfo     2018-05-22 17:14:01.845071479 +0200
-@@ -50,9 +50,9 @@
+--- gengetopt-2.23/doc/gengetopt.texi.orig     2019-06-26 21:12:05.153756178 +0200
++++ gengetopt-2.23/doc/gengetopt.texi  2019-06-26 21:43:17.613612193 +0200
+@@ -47,9 +47,9 @@
  @end quotation
  @end copying
  
 -@dircategory GNU programming tools
 +@dircategory Programming tools:
  @direntry
--* Gengetopt: (gengetopt).         Create command line options parsers
+-* Gengetopt: (gengetopt). Create command line options parsers
 +* Gengetopt: (gengetopt).             Create command line options parsers
  @end direntry
  

diff --git a/gengetopt.spec b/gengetopt.spec
index 763b90d258048c09678339e93f541a8285ab66cd..998a63b0aab819af2f173aff698be118b44b2d5e 100644 (file)
--- a/gengetopt.spec
+++ b/gengetopt.spec
@@ -1,21 +1,22 @@
 Summary:       C code generator that generates command line options parsers
 Summary(pl.UTF-8):     Generator kodu C generujący analizatory opcji linii poleceń
 Name:          gengetopt
-Version:       2.22.6
+Version:       2.23
 Release:       1
 License:       GPL v3+
 Group:         Development/Tools
-Source0:       http://ftp.gnu.org/gnu/gengetopt/%{name}-%{version}.tar.gz
-# Source0-md5: 29749a48dda69277ab969c510597a14e
+Source0:       https://ftp.gnu.org/gnu/gengetopt/%{name}-%{version}.tar.xz
+# Source0-md5: ea165d618640dbdecb42ae4491337965
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-am.patch
 URL:           http://www.gnu.org/software/gengetopt/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake
 BuildRequires: help2man
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
+BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
+BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +43,6 @@ Przykłady do gengetopt.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -65,6 +65,8 @@ cp -p doc/README.example $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gengetopt
+# .texi meant just for index.html(?)
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/index.info
 
 %clean
 rm -rf $RPM_BUILD_ROOT