diff --git a/baselibs.conf b/baselibs.conf index 2a2e460..5d68e49 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libnetfilter_cthelper-0-0 +libnetfilter_cthelper0 diff --git a/libname.diff b/libname.diff deleted file mode 100644 index e0da1cf..0000000 --- a/libname.diff +++ /dev/null @@ -1,22 +0,0 @@ - -In anticipation that the official release might use -libnetfilter_cthelper.so.0 as SONAME, make sure this prerelease has a -different one. - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libnetfilter_cthelper/src/Makefile.am -=================================================================== ---- libnetfilter_cthelper.orig/src/Makefile.am -+++ libnetfilter_cthelper/src/Makefile.am -@@ -2,7 +2,7 @@ include $(top_srcdir)/Make_global.am - lib_LTLIBRARIES = libnetfilter_cthelper.la - - libnetfilter_cthelper_la_LIBADD = ${LIBMNL_LIBS} --libnetfilter_cthelper_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnetfilter_cthelper.map -version-info $(LIBVERSION) -+libnetfilter_cthelper_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnetfilter_cthelper.map -version-info $(LIBVERSION) -release 0 - libnetfilter_cthelper_la_SOURCES = libnetfilter_cthelper.c \ - libnetfilter_cthelper.map \ - internal.h diff --git a/libnetfilter_cthelper-0.tar.xz b/libnetfilter_cthelper-0.tar.xz deleted file mode 100644 index 37a9925..0000000 --- a/libnetfilter_cthelper-0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d16f13b99eb30968254a26b0bb059d8843e94207315b6499d3c85e0740581ec -size 17428 diff --git a/libnetfilter_cthelper-1.0.0.tar.bz2 b/libnetfilter_cthelper-1.0.0.tar.bz2 new file mode 100644 index 0000000..f6a5185 --- /dev/null +++ b/libnetfilter_cthelper-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d +size 275229 diff --git a/libnetfilter_cthelper-1.0.0.tar.bz2.sig b/libnetfilter_cthelper-1.0.0.tar.bz2.sig new file mode 100644 index 0000000..94c64a9 Binary files /dev/null and b/libnetfilter_cthelper-1.0.0.tar.bz2.sig differ diff --git a/libnetfilter_cthelper.changes b/libnetfilter_cthelper.changes index ef8ea71..c35a603 100644 --- a/libnetfilter_cthelper.changes +++ b/libnetfilter_cthelper.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 8 15:35:52 UTC 2012 - jengelh@inai.de + +- Update to initial official release 1.0.0 +* This library provides the infrastructure for the user-space + helper infrastructure available since the Linux kernel 3.6. + ------------------------------------------------------------------- Fri Aug 31 18:06:01 UTC 2012 - jengelh@inai.de diff --git a/libnetfilter_cthelper.spec b/libnetfilter_cthelper.spec index 7f6421a..09c7c14 100644 --- a/libnetfilter_cthelper.spec +++ b/libnetfilter_cthelper.spec @@ -17,8 +17,8 @@ Name: libnetfilter_cthelper -%define lname %{name}-0-0 -Version: 0 +%define lname %{name}0 +Version: 1.0.0 Release: 0 Url: http://netfilter.org/projects/libnetfilter_cthelper/ Summary: Userspace library for the Netfilter Conntrack Helper extension @@ -26,20 +26,20 @@ License: GPL-2.0+ Group: Productivity/Networking/Security #Git-Clone: git://git.netfilter.org/libnetfilter_cthelper -Source: %name-%version.tar.xz +#DL-URL: http://netfilter.org/projects/libnetfilter_cthelper/files/ +Source: http://netfilter.org/projects/libnetfilter_cthelper/files/%name-%version.tar.bz2 +Source2: http://netfilter.org/projects/libnetfilter_cthelper/files/%name-%version.tar.bz2.sig Source3: baselibs.conf -Patch1: libname.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake >= 1.6 -BuildRequires: libtool >= 2 +#BuildRequires: autoconf +#BuildRequires: automake >= 1.6 +#BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.21 %if 0%{?suse_version} >= 1140 || 0%{?fedora_version} BuildRequires: pkgconfig(libmnl) >= 1.0.0 %else BuildRequires: libmnl-devel >= 1.0.0 %endif -BuildRequires: xz %description This library provides the programming interface (API) to the @@ -63,13 +63,7 @@ This library provides the programming interface (API) to the Netfilter userspace helper infrastructure. %prep -%if 0%{?__xz:1} -%setup -qn %name -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name -%endif -%patch -P 1 -p1 +%setup -q %build if [ ! -e configure ]; then @@ -88,7 +82,7 @@ rm -f "%buildroot/%_libdir"/*.la; %files -n %lname %defattr(-,root,root) -%_libdir/libnetfilter_cthelper-0.so.0* +%_libdir/libnetfilter_cthelper.so.0* %files devel %defattr(-,root,root)