[libnetfilter_conntrack: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libnetfilter_conntrack

[Paul Komkoff]

commit cc66dc3916b67867e8450ee48c65500a900effe1
Merge: 84a796a 0ce8c80
Author: Paul P. Komkoff <i at stingr.net>
Date:   Sat Mar 17 17:24:58 2012 +0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/libnetfilter_conntrack
    
    Conflicts:
    	libnetfilter_conntrack.spec

 libnetfilter_conntrack.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc libnetfilter_conntrack.spec
index 1a37961,b0965d6..bf9c974
--- a/libnetfilter_conntrack.spec
+++ b/libnetfilter_conntrack.spec
@@@ -6,6 -6,7 +6,7 @@@ Group:          System Environment/Libr
  License:        GPLv2+
  URL:            http://netfilter.org
  Source0:        http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
 -Patch0:		libnetfilter_conntrack-sysheader.patch
++Patch0:         libnetfilter_conntrack-sysheader.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  libnfnetlink-devel >= 1.0.0, pkgconfig, kernel-headers
@@@ -56,9 -58,9 +58,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_includedir}/libnetfilter_conntrack/*.h
  
  %changelog
 +* Sat Mar 17 2012 Paul P. Komkoff Jr <i at stingr.net> - 1.0.0-1
 +- new upstream version
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Apr  3 2011 Paul P. Komkoff Jr <i at stingr.net> - 0.9.1-1
  - new upstream version