diff --git a/.gitignore b/.gitignore index dd5d8bc..398788f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ uriparser-0.7.5.tar.gz /uriparser-0.7.5.tar.gz +/uriparser-0.7.8.tar.bz2 diff --git a/sources b/sources index 1e213e8..9a0955a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -459c2786758929b92bfbd0cee25b5aa0 uriparser-0.7.5.tar.gz +1ff590e25e8d9f5eaaa409c741fc387b uriparser-0.7.8.tar.bz2 diff --git a/uriparser-0.7.5-doc_Makefile_in.patch b/uriparser-0.7.5-doc_Makefile_in.patch deleted file mode 100644 index 85b5758..0000000 --- a/uriparser-0.7.5-doc_Makefile_in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- uriparser-0.7.5.org/doc/Makefile.in 2010-09-07 17:02:01.000000000 +0530 -+++ uriparser-0.7.5/doc/Makefile.in 2010-09-07 17:02:11.000000000 +0530 -@@ -344,7 +344,7 @@ - - install-data-local: - $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local -- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/" -+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" - - uninstall-local: - -rm -Rf "$(DESTDIR)$(docdir)/html" diff --git a/uriparser.spec b/uriparser.spec index 44e5fc0..f5748b9 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -1,13 +1,12 @@ Name: uriparser -Version: 0.7.5 -Release: 7%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: URI parsing library - RFC 3986 Group: System Environment/Libraries License: BSD URL: http://%{name}.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: uriparser-0.7.5-doc_Makefile_in.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, graphviz, cpptest-devel Requires: cpptest @@ -28,33 +27,25 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .doc_Makefile_in sed -i 's/\r//' THANKS sed -i 's/\r//' COPYING iconv -f iso-8859-1 -t utf-8 -o THANKS{.utf8,} mv THANKS{.utf8,} %build -%configure --disable-static -cd doc; -# Remove qhelpgenerator dependency, by commenting these lines in -# Doxygen.in -## .qch output -## QCH_FILE = "../uriparser-doc-0.7.5.qch" -## QHG_LOCATION = "qhelpgenerator" -sed -i 's/^# .qch output.*//' Doxyfile.in -sed -i 's/^QCH.*//' Doxyfile.in -sed -i 's/^QHG.*//' Doxyfile.in +# Remove qhelpgenerator dependency by commenting Doxygen.in: +# sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' Doxyfile.in +sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in -%configure; make %{?_smp_mflags}; cd .. -make %{?_smp_mflags} +%configure --disable-static -# doc folder has separate configure file -#cd doc; -# fix for automated autotool calls -#touch aclocal.m4 configure Makefile.in -#%configure; make %{?_smp_mflags} +# Generate docs first +cd doc; +make %{?_smp_mflags} +cd .. +# Build +make %{?_smp_mflags} %check make check @@ -87,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jul 30 2013 François Cami - 0.7.8-1 +- Update to 0.7.8 + * Fri Feb 15 2013 Fedora Release Engineering - 0.7.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild