- updated to 0.7.1

- added am patch (automake rebuild fix)

diff --git a/libpsl-am.patch b/libpsl-am.patch
new file mode 100644 (file)
index 0000000..a485cbf
--- /dev/null
+++ b/libpsl-am.patch
@@ -0,0 +1,32 @@
+--- libpsl-libpsl-0.7.1/Makefile.am.orig       2015-03-02 18:19:48.641096106 +0100
++++ libpsl-libpsl-0.7.1/Makefile.am    2015-03-02 18:25:10.937749247 +0100
+@@ -1,6 +1,7 @@
+ # got some hints from https://gitorious.org/openismus-playground/examplelib/source
+ 
+ SUBDIRS = po include src tools data $(LIBPSL_DOCS) tests
++DIST_SUBDIRS = docs/libpsl
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+--- libpsl-libpsl-0.7.1/configure.ac.orig      2015-03-02 18:25:55.964414025 +0100
++++ libpsl-libpsl-0.7.1/configure.ac   2015-03-02 20:20:44.577458269 +0100
+@@ -37,8 +37,6 @@
+ ])
+ 
+ if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then
+-  docdir_makefile=docs/libpsl/Makefile
+-  docdir_version_xml=docs/libpsl/version.xml
+   AC_SUBST([LIBPSL_DOCS], [docs/libpsl])
+ fi
+ 
+@@ -253,8 +251,8 @@
+                  src/Makefile
+                  tools/Makefile
+                  po/Makefile.in
+-                 ${docdir_makefile}
+-                 ${docdir_version_xml}
++                 docs/libpsl/Makefile
++                 docs/libpsl/version.xml
+                  data/Makefile
+                  tests/Makefile
+                  libpsl.pc:libpsl.pc.in])

diff --git a/libpsl.spec b/libpsl.spec
index 0287b1df7c0042b62b7243fea07a096534ae36c2..160c72db95408cc791832dd469fc50b8619e7240 100644 (file)
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -5,12 +5,13 @@
 Summary:       C library for the Publix Suffix List
 Summary(pl.UTF-8):     Biblioteka C do obsługi listy przyrostków publicznych (Public Suffix List)
 Name:          libpsl
-Version:       0.6.0
-Release:       2
+Version:       0.7.1
+Release:       1
 License:       MIT
 Group:         Networking
-Source0:       https://github.com/rockdaboot/libpsl/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3fc6e6701c92216f2cae0340704dba2e
+Source0:       https://github.com/rockdaboot/libpsl/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 953eb964a5c95c42246558cafc812607
+Patch0:                %{name}-am.patch
 URL:           https://rockdaboot.github.io/libpsl
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.10
@@ -20,6 +21,7 @@ BuildRequires:        gtk-doc >= 1.15
 BuildRequires: libicu-devel
 BuildRequires: libtool >= 2:2
 BuildRequires: libxslt-progs
+BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -123,7 +125,8 @@ przykład, czy domeny są przyrostkami publicznymi, czy domena
 ciasteczka jest akceptowalna dla domen itp.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
 
 # gettextize workaround
 %{__sed} -i -e 's,po/Makefile\.in,,' configure.ac