rpms/libannodex/FC-4 libannodex.man.patch, NONE, 1.1 libannodex.spec, 1.3, 1.4

Thomas Vander Stichele (thomasvs) fedora-extras-commits at redhat.com
Sun Mar 5 15:44:04 UTC 2006


Author: thomasvs

Update of /cvs/extras/rpms/libannodex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30489

Modified Files:
	libannodex.spec 
Added Files:
	libannodex.man.patch 
Log Message:
new version

libannodex.man.patch:

--- NEW FILE libannodex.man.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 2140)
+++ configure.ac	(working copy)
@@ -38,8 +38,8 @@
 fi
   
 # Check for docbook
-AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false)
-AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN)
+AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false)
+AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse")
 AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML)
 
Index: doc/Makefile.am
===================================================================
--- doc/Makefile.am	(revision 2140)
+++ doc/Makefile.am	(working copy)
@@ -64,7 +64,7 @@
 
 if HAVE_DOCBOOKTOMAN
 %.1: %.1.sgml
-	docbook-to-man $< > $@
+	$(DOCBOOKTOMAN) $< > $@
 else
 %.1: %.1.sgml
 endif


Index: libannodex.spec
===================================================================
RCS file: /cvs/extras/rpms/libannodex/FC-4/libannodex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libannodex.spec	5 Mar 2006 14:35:07 -0000	1.3
+++ libannodex.spec	5 Mar 2006 15:44:03 -0000	1.4
@@ -1,22 +1,29 @@
 Name:           libannodex
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library for annotating and indexing networked media
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:		http://www.annodex.net/
 Source:		http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz
+Patch:          libannodex.man.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/ldconfig
 
 BuildRequires:	doxygen
+BuildRequires:	docbook-utils
 BuildRequires:	libogg-devel >= 1.0
 BuildRequires:	liboggz-devel >= 0.9.1
 BuildRequires:	libcmml-devel >= 0.8
 BuildRequires:	libsndfile-devel
 
+# because of patch
+BuildRequires:  libtool
+BuildRequires:  autoconf
+BuildRequires:  automake
+
 # libtool
 BuildRequires:	gcc-c++
 
@@ -40,6 +47,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch
+
+aclocal -I m4
+libtoolize
+autoconf
+automake
 
 %build
 %configure
@@ -58,7 +71,7 @@
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-                                                                                
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README
@@ -91,7 +104,16 @@
 
 %changelog
 * Sun Mar 05 2006 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.7.3-1: new upstream release
+- 0.7.3-3
+- added docbook-utils, needed for man page build
+
+* Sun Mar 05 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.7.3-2
+- added patch for man pages
+
+* Sun Mar 05 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.7.3-1
+- new upstream release
 
 * Sun Nov 13 2005 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.7.2-1: new upstream release




More information about the fedora-extras-commits mailing list