- up to 2.0.2-566; epoch 1

Changed files:
    apparmor-parser.spec -> 1.14

diff --git a/apparmor-parser.spec b/apparmor-parser.spec
index c335310ac816e8218b3cc3534373af835e8dd031..2679158ee9f8c3e73882c9ec971035608807ac16 100644 (file)
--- a/apparmor-parser.spec
+++ b/apparmor-parser.spec
@@ -1,28 +1,27 @@
 
 %bcond_without tests
 
 
 %bcond_without tests
 

-%define                _ver 2.0
-%define                _svnrel 150
+%define                _ver 2.0.2
+%define                _svnrel 566

 Summary:       AppArmor userlevel parser utility
 Summary(pl.UTF-8):     Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:          apparmor-parser
 Version:       %{_ver}.%{_svnrel}
 Release:       0.3
 Summary:       AppArmor userlevel parser utility
 Summary(pl.UTF-8):     Narzędzie przestrzeni użytkownika do przetwarzania AppArmor
 Name:          apparmor-parser
 Version:       %{_ver}.%{_svnrel}
 Release:       0.3

+Epoch:         1

 License:       GPL
 Group:         Applications/System
 License:       GPL
 Group:         Applications/System

-Source0:       http://forge.novell.com/modules/xfcontent/private.php/apparmor/Development%20-%20October%20Snapshot/%{name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5: cbb25435e4353b10b5fdd96f80c854b9
+Source0:       http://forge.novell.com/modules/xfcontent/private.php/apparmor/LKML_Submission-April_07/%{name}-%{_ver}-%{_svnrel}.tar.gz
+# Source0-md5: 9851ad9eec502a04b5d01998492e92f7

 Source1:       %{name}.init
 Source1:       %{name}.init

-Patch0:                %{name}-pld.patch
-Patch1:                %{name}-no-fdopendir.patch
-Patch2:                %{name}-avoid-pushpop.patch
-Patch3:                %{name}-init-args.patch
+Patch0:                %{name}-init-args.patch

 URL:           http://forge.novell.com/modules/xfmod/project/?apparmor
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: libcap-devel
 BuildRequires: perl-Test-Harness >= 2.64
 URL:           http://forge.novell.com/modules/xfmod/project/?apparmor
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: libcap-devel
 BuildRequires: perl-Test-Harness >= 2.64

+BuildRequires: perl-tools-pod

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -38,14 +37,12 @@ SubDomain.
 
 %prep
 %setup -q -n %{name}-%{_ver}
 
 %prep
 %setup -q -n %{name}-%{_ver}

-%patch0 -p1
-%patch1 -p1
-%patch2 -p2
-%patch3 -p2
+%patch0 -p2

 
 %build
 %{__make} \
        CC="%{__cc}" \
 
 %build
 %{__make} \
        CC="%{__cc}" \

+       CXX="%{__cxx}" \

        CFLAGS="%{rpmcflags}"
 
 %{?with_tests:%{__make} tests}
        CFLAGS="%{rpmcflags}"
 
 %{?with_tests:%{__make} tests}