packages: autogen/autogen.spec, autogen/autogen-info.patch (NEW), autogen/a...

qboosh qboosh at pld-linux.org
Wed Feb 22 19:13:10 CET 2012 

Author: qboosh                       Date: Wed Feb 22 18:13:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 5.14
- separated -libs (runtime package for programs using libopts i.e. AutoOpts library)
- base requres -libs and suggests -devel
- added notinstalled patch to fix build without installed autogen
- added info patch to unify direntry

---- Files affected:
packages/autogen:
   autogen.spec (1.18 -> 1.19) , autogen-info.patch (NONE -> 1.1)  (NEW), autogen-notinstalled.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/autogen/autogen.spec
diff -u packages/autogen/autogen.spec:1.18 packages/autogen/autogen.spec:1.19
--- packages/autogen/autogen.spec:1.18	Sun Sep 11 16:31:35 2011
+++ packages/autogen/autogen.spec	Wed Feb 22 19:13:05 2012
@@ -1,19 +1,24 @@
 # $Revision$, $Date$
-%define	pre	pre4
 Summary:	Automated program generator
 Summary(pl.UTF-8):	Zautomatyzowany generator programów
 Name:		autogen
-Version:	5.13.0
-Release:	0.%{pre}.1
-License:	GPL v.2/BSD/LGPL
-Group:		Development
-Source0:	http://autogen.sourceforge.net/data/%{name}-%{version}%{pre}.tar.xz
-# Source0-md5:	86f80b060d82ab1069043b3478df195f
+Version:	5.14
+Release:	1
+License:	GPL v3+ (AutoGen), LGPL v3+ or Modified BSD (AutoOpts library)
+Group:		Development/Tools
+Source0:	http://ftp.gnu.org/gnu/autogen/rel5.14/%{name}-%{version}.tar.xz
+# Source0-md5:	f82648739393ce5eba4c33ecd25df488
+Patch0:		%{name}-notinstalled.patch
+Patch1:		%{name}-info.patch
 URL:		http://autogen.sourceforge.net/
 BuildRequires:	guile-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libxml2-devel
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
+BuildRequires:	xz
+Requires:	%{name}-libs = %{version}-%{release}
+Suggests:	%{name}-devel = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,32 +36,49 @@
 kilka bloków takiego tekstu, które muszą być synchronizowane
 równolegle.
 
+%package libs
+Summary:	Shared AutoOpts library
+Summary(pl.UTF-8):	Biblioteka współdzielona AutoOpts
+License:	LGPL v3+ or Modified BSD
+Group:		Libraries
+Conflicts:	autogen < 5.14
+
+%description libs
+Shared AutoOpts library.
+
+%description libs -l pl.UTF-8
+Biblioteka współdzielona AutoOpts.
+
 %package devel
-Summary:	Header files for autogen
-Summary(pl.UTF-8):	Pliki nagłówkowe dla autogen
+Summary:	Header files for AutoOpts library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki AutoOpts
+License:	LGPL v3+ or Modified BSD
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
-Header files for autogen.
+Header files for AutoOpts library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla autogen.
+Pliki nagłówkowe biblioteki AutoOpts.
 
 %package static
-Summary:	Static autogen library
-Summary(pl.UTF-8):	Statyczna biblioteka autogen
+Summary:	Static AutoOpts library
+Summary(pl.UTF-8):	Statyczna biblioteka AutoOpts
+License:	LGPL v3+ or Modified BSD
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static autogen library.
+Static AutoOpts library.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka autogen.
+Statyczna biblioteka AutoOpts.
 
 %prep
-%setup -q -n %{name}-%{version}%{pre}
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -69,40 +91,57 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# .pc file is arch-dependent, so use arch-dependent pkgconfigdir
 mv $RPM_BUILD_ROOT%{_datadir}/pkgconfig/autoopts.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
 
 %postun
-/sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir %{_infodir} >/dev/null 2>&1
 
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_bindir}/autogen
+%attr(755,root,root) %{_bindir}/columns
+%attr(755,root,root) %{_bindir}/getdefs
+%attr(755,root,root) %{_bindir}/xml2ag
 %{_datadir}/%{name}
 %{_infodir}/autogen.info*
-%{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3*
+%{_mandir}/man1/autogen.1*
+%{_mandir}/man1/columns.1*
+%{_mandir}/man1/getdefs.1*
+%{_mandir}/man1/xml2ag.1*
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libopts.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libopts.so.25
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_bindir}/autoopts-config
+%attr(755,root,root) %{_libdir}/libopts.so
+%{_libdir}/libopts.la
 %{_includedir}/autoopts
-%{_aclocaldir}/*.m4
-%{_pkgconfigdir}/*.pc
+%{_aclocaldir}/autoopts.m4
+%{_pkgconfigdir}/autoopts.pc
+%{_mandir}/man1/autoopts-config.1*
+%{_mandir}/man3/ao_string_tokenize.3*
+%{_mandir}/man3/configFileLoad.3*
+%{_mandir}/man3/option*.3*
+%{_mandir}/man3/str*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libopts.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -110,6 +149,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2012/02/22 18:13:05  qboosh
+- updated to 5.14
+- separated -libs (runtime package for programs using libopts i.e. AutoOpts library)
+- base requres -libs and suggests -devel
+- added notinstalled patch to fix build without installed autogen
+- added info patch to unify direntry
+
 Revision 1.18  2011/09/11 14:31:35  arekm
 - up to 5.13 (pre as stable doesn't support guile 2.x)
 

================================================================
Index: packages/autogen/autogen-info.patch
diff -u /dev/null packages/autogen/autogen-info.patch:1.1
--- /dev/null	Wed Feb 22 19:13:10 2012
+++ packages/autogen/autogen-info.patch	Wed Feb 22 19:13:05 2012
@@ -0,0 +1,14 @@
+--- autogen-5.14/doc/auto_gen-tpl.in.orig	2012-02-21 21:08:40.174648705 +0100
++++ autogen-5.14/doc/auto_gen-tpl.in	2012-02-22 17:46:17.743801787 +0100
+@@ -75,9 +75,9 @@
+ 
+ @end ignore
+ 
+- at dircategory GNU programming tools
++ at dircategory Programming tools:
+ @direntry
+-* AutoGen: (autogen).         [= prog-title =]
++* AutoGen: (autogen).			[= prog-title =]
+ @end direntry
+ 
+ @ifinfo

================================================================
Index: packages/autogen/autogen-notinstalled.patch
diff -u /dev/null packages/autogen/autogen-notinstalled.patch:1.1
--- /dev/null	Wed Feb 22 19:13:10 2012
+++ packages/autogen/autogen-notinstalled.patch	Wed Feb 22 19:13:05 2012
@@ -0,0 +1,13 @@
+--- autogen-5.14/doc/auto-opts.tpl.orig	2011-12-21 20:35:06.000000000 +0100
++++ autogen-5.14/doc/auto-opts.tpl	2012-02-21 21:02:00.421301985 +0100
+@@ -112,8 +112,8 @@
+ \=]
+ base=check
+ BASE=`echo $base | tr a-z- A-Z_`
+-cflags="-DTEST_${BASE} `autoopts-config cflags`"
+-ldflags="`autoopts-config ldflags`"
++cflags="-DTEST_${BASE} "
++ldflags="-L${top_builddir}/autoopts/.libs -lopts"
+ autogen ${base}.def
+ cc -o ${base} -g ${cflags} ${base}.c ${ldflags}
+ ./${base} --help
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/autogen/autogen.spec?r1=1.18&r2=1.19&f=u

More information about the pld-cvs-commit mailing list