[conntrack-tools/el6] Revert "* Mon May 07 2012 Paul Wouters <pwouters at redhat.com> - 1.0.1-1"

[Orion Poplawski]

commit 142f42e8be74c8d3139e93a340a015ced9b64f34
Author: Orion Poplawski <orion at nwra.com>
Date:   Wed May 7 13:49:35 2014 -0600

    Revert "* Mon May 07 2012 Paul Wouters <pwouters at redhat.com> - 1.0.1-1"
    
    This reverts commit fe8bf312366c96a6a3a70e2873fe1f98a1dafd22.

 .gitignore                 |    1 -
 conntrack-tools-NULL.patch |   13 --
 conntrack-tools.spec       |   60 ++-----
 conntrackd.conf            |  419 --------------------------------------------
 conntrackd.service         |   11 --
 conntrackd.sysconfig       |    6 +
 sources                    |    2 +-
 7 files changed, 20 insertions(+), 492 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f6f2be9..4eb5016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 conntrack-tools-0.9.14.tar.bz2
 /conntrack-tools-0.9.15.tar.bz2
 /conntrack-tools-1.0.0.tar.bz2
-/conntrack-tools-1.0.1.tar.bz2
diff --git a/conntrack-tools.spec b/conntrack-tools.spec
index 246f4ed..74e030a 100644
--- a/conntrack-tools.spec
+++ b/conntrack-tools.spec
@@ -1,28 +1,18 @@
 Name:           conntrack-tools
-Version:        1.0.1
-Release:        1%{?dist}
-Summary:        Manipulate netfilter connection tracking table and run High Availability
+Version:        1.0.0
+Release: 	2%{?dist}
+Summary:        Tools to manipulate netfilter connection tracking table
 Group:          System Environment/Base
 License:        GPLv2
 URL:            http://netfilter.org
 Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
-Source1:        conntrackd.service
-Source2:        conntrackd.conf
-Patch1:         conntrack-tools-NULL.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libnfnetlink-devel >= 1.0.0, libnetfilter_conntrack-devel >= 0.9.1
-BuildRequires:  pkgconfig bison flex
+BuildRequires:	pkgconfig bison flex
 Provides:       conntrack = 1.0-1
 Obsoletes:      conntrack < 1.0-1
-BuildRequires: systemd-units
-Requires(post): systemd-sysv
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
 
 %description
-With conntrack-tools you can setup a High Availability cluster and
-synchronize conntrack state between multiple firewalls.
-
 The conntrack-tools package contains two programs:
 - conntrack: the command line interface to interact with the connection
              tracking system.
@@ -40,50 +30,26 @@ show an event message (one line) per newly established connection.
 
 %prep
 %setup -q
-%patch1 -p1 
 
 %build
 %configure --disable-static
 %{__make} %{?_smp_mflags}
-chmod 644 doc/sync/primary-backup.sh
 
 %install
-%{__make} install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}/conntrackd
-install -d 0755 %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
-install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/conntrackd/
+rm -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc COPYING AUTHORS TODO doc
-%dir %{_sysconfdir}/conntrackd
-%config(noreplace) %{_sysconfdir}/conntrackd/conntrackd.conf
-%{_unitdir}/conntrackd.service
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS INSTALL TODO doc
 %{_sbindir}/conntrack
 %{_sbindir}/conntrackd
 %{_mandir}/man8/*
 
-%preun
-if [ $1 -eq 0 ]; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable conntrackd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop conntrackd.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart conntrackd.service >/dev/null 2>&1 || :
-fi
-
 %changelog
-* Mon May 07 2012 Paul Wouters <pwouters at redhat.com> - 1.0.1-1
-- Updated to 1.0.1
-- Added daemon using systemd and configuration file
-- Removed legacy spec requirements
-- Patch for: parse.c:240:34: error: 'NULL' undeclared 
-
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -128,7 +94,7 @@ fi
 - remove rollup patch
 
 * Wed Jul 16 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.7-2
-- fix Patch0/%%patch.
+- fix Patch0/%patch.
 
 * Wed Jul 16 2008 Paul P. Komkoff Jr <i at stingr.net> - 0.9.7-1
 - new upstream version
diff --git a/conntrackd.sysconfig b/conntrackd.sysconfig
new file mode 100644
index 0000000..acaa2cd
--- /dev/null
+++ b/conntrackd.sysconfig
@@ -0,0 +1,6 @@
+# Override the default config file
+#CONNTRACKD_CONFIG=/etc/conntrackd/conntrackd.conf
+
+# Any arguments
+#CONNTRACKD_ARGS=
+
diff --git a/sources b/sources
index 4b93ca2..ab8af58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a60f02a177fc31fe40cc992c4de90e2  conntrack-tools-1.0.1.tar.bz2
+5add24d4761baf17af630d5627a71752  conntrack-tools-1.0.0.tar.bz2