[nocpulse-common] rebase to nocpulse-common-2.2.1

[Miroslav Suchý]

commit a441f00be22f6121d47a84436320ee39e878e24c
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Tue Nov 22 17:15:28 2011 +0100

    rebase to nocpulse-common-2.2.1

 .gitignore           |    1 +
 nocpulse-common.spec |   28 ++++++++++++++++++----------
 sources              |    2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7cd31f1..35ce35b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 nocpulse-common-2.1.19.tar.gz
 /nocpulse-common-2.1.22.tar.gz
+/nocpulse-common-2.2.1.tar.gz
diff --git a/nocpulse-common.spec b/nocpulse-common.spec
index 3c795bd..8743055 100644
--- a/nocpulse-common.spec
+++ b/nocpulse-common.spec
@@ -1,6 +1,6 @@
 Name:         nocpulse-common
-Version:      2.1.22
-Release:      3%{?dist}
+Version:      2.2.1
+Release:      1%{?dist}
 Summary:      NOCpulse common
 License:      GPLv2
 URL:          https://fedorahosted.org/spacewalk
@@ -48,11 +48,15 @@ mkdir -p %{buildroot}%{_var}/lib/%{package_name}/.ssh
 
 # install log rotation stuff
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -m644 nocpulse.logrotate \
+%if 0%{?fedora} && 0%{?fedora} >= 16
+install -m644 nocpulse.logrotate.new \
    $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-
+%else
+install -m644 nocpulse.logrotate.old \
+   $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%endif
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}
-install -m644 NOCpulse.ini $RPM_BUILD_ROOT/%{_sysconfdir}/%{package_name}/NOCpulse.ini
+install -m644 NOCpulse.ini $RPM_BUILD_ROOT/%{_sysconfdir}/NOCpulse.ini
 install -m755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/%{package_name}/NOCpulse/tmp
 install -m644 forward $RPM_BUILD_ROOT/%{_var}/lib/%{package_name}/.forward
 mkdir -p $RPM_BUILD_ROOT%{perl_vendorlib}/NOCpulse/Config/test
@@ -129,7 +133,7 @@ fi
 %files
 %defattr(-, root,root,-)
 %dir %{_sysconfdir}/nocpulse
-%config(missingok,noreplace) %{_sysconfdir}/%{package_name}/NOCpulse.ini
+%config(missingok,noreplace) %{_sysconfdir}/NOCpulse.ini
 %{_sysconfdir}/%{package_name}/NOCpulse
 %attr(-, %{package_name},%{package_name}) %{_sysconfdir}/%{package_name}/NOCpulse/tmp
 %config(missingok,noreplace) %attr(-, %{package_name},%{package_name}) %{_var}/lib/%{package_name}/.forward
@@ -146,11 +150,15 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.1.22-3
-- Perl mass rebuild
+* Tue Nov 22 2011 Miroslav Suchý 2.2.1-1
+- bump up version
+- 755963 - logrotate nocpulse even on Fedora 16
+
+* Thu Jun 02 2011 Miroslav Suchý 2.1.24-1
+- 710002 - create initial NOCpulse.ini on correct place
 
-* Fri Jun 10 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.1.22-2
-- Perl 5.14 mass rebuild
+* Mon May 02 2011 Jan Pazdziora 2.1.23-1
+- The close of IO::AtomicFile can also die, we should catch it right there.
 
 * Fri Mar 18 2011 Michael Mraka <michael.mraka at redhat.com> 2.1.22-1
 - fixed ownership of NOCpulse/tmp directory
diff --git a/sources b/sources
index ee0e44c..8d8e6e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9d0e7f61d697e15472238d7083be9ba  nocpulse-common-2.1.22.tar.gz
+c7831288bc423b424b15f2bfe9a9fcd6  nocpulse-common-2.2.1.tar.gz