diff --git a/bibutils-bin-cflags.patch b/bibutils-bin-cflags.patch
deleted file mode 100644
index 24e4ef9..0000000
--- a/bibutils-bin-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u bibutils_4.15/bin/Makefile.dynamic\~ bibutils_4.15/bin/Makefile.dynamic
---- bibutils_4.15/bin/Makefile.dynamic~ 2012-10-01 19:18:23.970736534 +0900
-+++ bibutils_4.15/bin/Makefile.dynamic 2012-10-01 19:23:09.782351650 +0900
-@@ -4,7 +4,6 @@
- # dynamic linkage version
- #
-
--CFLAGS = -I ../lib
- LDFLAGS = -L ../lib
- LDLIBS = -lbibutils
-
diff --git a/bibutils-cflags.patch b/bibutils-cflags.patch
new file mode 100644
index 0000000..e4693a8
--- /dev/null
+++ b/bibutils-cflags.patch
@@ -0,0 +1,28 @@
+--- bibutils_4.17/Makefile_start~ 2013-01-28 17:08:20.147404296 +0900
++++ bibutils_4.17/Makefile_start 2013-01-28 17:23:23.514129913 +0900
+@@ -35,14 +35,14 @@
+ all : FORCE
+ $(MAKE) -C lib -k \
+ CC=$(CC) \
+- CFLAGSIN=$(CLIBFLAGS) \
++ CFLAGSIN="$(CLIBFLAGS) $(DISTRO_CFLAGS)"\
+ LIBTARGETIN=$(LIBTARGET) \
+ MAJORVERSION=$(MAJORVERSION) \
+ MINORVERSION=$(MINORVERSION) \
+ RANLIB=$(RANLIB)
+ $(MAKE) -C bin -k \
+ CC=$(CC) \
+- CFLAGSIN=$(CFLAGS) \
++ CFLAGSIN="$(CFLAGS) $(DISTRO_CFLAGS)"\
+ EXEEXT=$(EXEEXT) \
+ VERSION="$(VERSION)" \
+ DATE="$(DATE)" \
+@@ -63,7 +63,7 @@
+ $(MAKE) -C lib
+ $(MAKE) -C bin test
+ $(MAKE) -C test \
+- CFLAGSIN=$(CFLAGS) \
++ CFLAGSIN="$(CFLAGS) $(DISTRO_CFLAGS)"\
+ test
+
+ install: all FORCE
diff --git a/bibutils-fix-docbook-tag.patch b/bibutils-fix-docbook-tag.patch
deleted file mode 100644
index 4df613f..0000000
--- a/bibutils-fix-docbook-tag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u bibutils_4.15/bibutils.dbk\~ bibutils_4.15/bibutils.dbk
---- bibutils_4.15/bibutils.dbk~ 2012-09-27 09:12:03.000000000 +0900
-+++ bibutils_4.15/bibutils.dbk 2012-10-02 15:25:55.227180480 +0900
-@@ -293,7 +293,7 @@
- biblatex2xml converts a biblatex
- (not to be confused with bibtex) formatted reference file to an
- MODS XML-intermediate bibliography file.
--
-+
- biblatex2xml biblatex_file.bib > outputfile.xml
-
-
diff --git a/bibutils-lib-symlink.patch b/bibutils-lib-symlink.patch
index b4f22b3..87a3f76 100644
--- a/bibutils-lib-symlink.patch
+++ b/bibutils-lib-symlink.patch
@@ -1,7 +1,6 @@
-diff -u bibutils_4.15/lib/Makefile.dynamic\~ bibutils_4.15/lib/Makefile.dynamic
---- bibutils_4.15/lib/Makefile.dynamic~ 2012-09-27 09:12:03.000000000 +0900
-+++ bibutils_4.15/lib/Makefile.dynamic 2012-10-01 18:30:04.659484494 +0900
-@@ -45,8 +45,8 @@
+--- bibutils_4.17/lib/Makefile.dynamic.orig 2013-01-25 15:43:50.000000000 +0900
++++ bibutils_4.17/lib/Makefile.dynamic 2013-01-28 17:00:43.170431426 +0900
+@@ -81,8 +81,8 @@
echo INSTALLING LIBRARIES TO $(LIBINSTALLDIR)
mkdir -p $(LIBINSTALLDIR)
cp $(SOFULL) $(LIBINSTALLDIR)
@@ -11,4 +10,4 @@ diff -u bibutils_4.15/lib/Makefile.dynamic\~ bibutils_4.15/lib/Makefile.dynamic
+ ln -sf $(SOFULL) $(LIBINSTALLDIR)/$(SONAME)
clean:
- /bin/rm -f *.o core
+ rm -f *.o core
diff --git a/bibutils.spec b/bibutils.spec
index 5412fd9..7d6b433 100644
--- a/bibutils.spec
+++ b/bibutils.spec
@@ -1,5 +1,5 @@
Name: bibutils
-Version: 4.16
+Version: 4.17
Release: 1%{?dist}
Summary: Bibliography conversion tools
License: GPLv2
@@ -9,8 +9,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}_src.
BuildRequires: libxslt
BuildRequires: docbook-style-xsl
Patch1: bibutils-lib-symlink.patch
-Patch2: bibutils-bin-cflags.patch
-Patch3: bibutils-fix-docbook-tag.patch
+Patch2: bibutils-cflags.patch
%description
The bibutils package converts between various bibliography
@@ -37,14 +36,12 @@ Bibutils development files.
%setup -q -n %{name}_%{version}
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
-%patch3 -p1 -b .orig
+sed -i.orig -e "s/'\"/'/" -e "s/\"'/'/" configure
%build
./configure --install-dir %{buildroot}%{_bindir} --install-lib %{buildroot}%{_libdir} --dynamic
-export CFLAGS="-I../lib %{optflags}"
-make -C lib
-make -C bin
+make DISTRO_CFLAGS="%{optflags}"
xsltproc -o bibutils.1 --nonet %{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl bibutils.dbk
@@ -88,6 +85,10 @@ done
%changelog
+* Mon Jan 28 2013 Jens Petersen - 4.17-1
+- update to 4.17
+- patch and use upstream's Makefile
+
* Thu Jan 10 2013 Jens Petersen - 4.16-1
- update to 4.16
- update License to only GPLv2