Autobuild autoformatter for 57745

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=2

apparmor.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package apparmor-parser (Version 2.3.1)
+# spec file for package apparmor
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -46,7 +46,7 @@ Name:           apparmor
 %endif
 Summary:        AppArmor userlevel parser utility
 Version:        2.5.1
-Release:        42
+Release:        1
 Group:          Productivity/Networking/Security
 Source0:        apparmor-%{version}.tar.bz2
 Source1:        %{name}-profile-editor.png
@@ -102,11 +102,11 @@ BuildRequires:  texlive-latex
 BuildRequires:  swig
 
 %if %{with python}
-BuildRequires: swig python-devel
+BuildRequires:  python-devel swig
 %endif
 
 %if %{with ruby}
-BuildRequires: swig ruby-devel
+BuildRequires:  ruby-devel swig
 %endif
 
 %if %{with pam}
@@ -120,7 +120,7 @@ BuildRequires:	apache2-devel
 %endif
 
 %if %{with tomcat}
-BuildRequires: java-devel >= 1.6.0 ant tomcat6
+BuildRequires:  ant java-devel >= 1.6.0 tomcat6
 %endif
 
 %if %{with editor}
@@ -140,6 +140,7 @@ BuildRequires:  audit-devel dbus-1-devel libapparmor-devel pkg-config
 %endif
 
 %package parser
+License:        GPLv2+
 Summary:        AppArmor userlevel parser utility
 Group:          Productivity/Networking/Security
 Obsoletes:      subdomain_parser < %{version}
@@ -163,6 +164,7 @@ This package is part of a suite of tools that used to be named
 SubDomain.
 
 %package docs
+License:        GPLv2+
 Summary:        AppArmor Documentation package
 Group:          Documentation/Other
 
@@ -180,9 +182,12 @@ Authors:
     Seth Arnold <seth.arnold@novell.com>
 
 %if %{with apache}
+
 %package -n apache2-mod_apparmor
+License:        GPLv2+
 Summary:        AppArmor module for apache2
 Group:          Productivity/Security
+
 %description -n apache2-mod_apparmor
 apache2-modapparmor adds support to apache2 to provide AppArmor
 confinement to individual cgi scripts handled by apache modules like
@@ -201,7 +206,7 @@ Authors:
 %package -n libapparmor1
 Summary:        Utility library for AppArmor
 Group:          Development/Libraries/C and C++
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 %ifarch ppc64
 Obsoletes:      libapparmor-64bit < %{version}
 Provides:       libapparmor-64bit = ${version}
@@ -222,7 +227,7 @@ Authors:
     Matt Barringer <mbarringer@suse.de>
 
 %package -n libapparmor-devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Requires:       libapparmor1 = %{version}-%{release}
 Group:          Development/Libraries/C and C++
 Provides:       libapparmor:/usr/include/sys/apparmor.h
@@ -238,7 +243,7 @@ Authors:
     Matt Barringer <mbarringer@suse.de>
 
 %package -n perl-apparmor
-License:        GPL v2 only ; LGPL v2.1 or later
+License:        GPLv2 ; LGPLv2.1+
 Requires:       libapparmor1 = %{version}
 Requires:       perl = %{perl_version}
 Group:          Development/Libraries/Perl
@@ -256,8 +261,9 @@ Authors:
     Matt Barringer <mbarringer@suse.de>
 
 %if %{with python}
+
 %package -n python-apparmor
-License:        GPL v2 only ; LGPL v2.1 or later
+License:        GPLv2 ; LGPLv2.1+
 Requires:       libapparmor1 = %{version}
 BuildRequires:  python
 Requires:       python = %{python_version}
@@ -277,8 +283,9 @@ Authors:
 %endif
 
 %if %{with ruby}
+
 %package -n ruby-apparmor
-License:        GPL v2 only ; LGPL v2.1 or later
+License:        GPLv2 ; LGPLv2.1+
 Requires:       libapparmor1 = %{version}
 Requires:       ruby = %{ruby_version}
 Group:          Development/Libraries/Ruby
@@ -297,6 +304,7 @@ Authors:
 %endif
 
 %package profiles
+License:        GPLv2 ; LGPLv2.1+
 Summary:        AppArmor profiles that are loaded into the apparmor kernel module
 Group:          Productivity/Security
 Obsoletes:      subdomain-profiles < %{version}
@@ -318,6 +326,7 @@ Authors:
     jjohansen@suse.de
 
 %package utils
+License:        GPLv2 ; LGPLv2.1+
 Summary:        AppArmor User-Level Utilities Useful for Creating AppArmor Profiles
 Group:          Productivity/Security
 Requires:       perl = %{perl_version}
@@ -325,7 +334,6 @@ Requires:	libapparmor1 = %{version}
 Requires:       perl-apparmor = %{version}
 BuildArch:      noarch
 
-
 %description utils
 This package provides the aa-logprof, aa-genprof, aa-autodep,
 aa-enforce, and aa-complain tools to assist with profile authoring.
@@ -339,7 +347,9 @@ Authors:
     seth.arnold@suse.de
 
 %if %{with tomcat}
+
 %package -n tomcat_apparmor
+License:        GPLv2 ; LGPLv2.1+
 Summary:        Tomcat 6 plugin for AppArmor change_hat
 Group:          System/Libraries
 Requires:       libapparmor1 = %{version} tomcat6
@@ -357,7 +367,9 @@ Authors:
 %endif
 
 %if %{with pam}
+
 %package -n pam_apparmor
+License:        GPLv2 ; LGPLv2.1+
 Summary:        PAM module to for AppArmor change_hat
 Group:          Productivity/Security
 
@@ -375,7 +387,9 @@ Authors:
 %endif
 
 %if %{with dbus}
+
 %package dbus
+License:        GPLv2 ; LGPLv2.1+
 Summary:        Audit dispatcher for sending AppArmor events over DBUS
 Group:          System/Monitoring
 
@@ -390,7 +404,9 @@ Authors:
 %endif
 
 %if %{with editor}
+
 %package profile-editor
+License:        GPLv2 ; LGPLv2.1+
 Summary:        AppArmor profile editor
 Group:          Productivity/Editors/Other
 
@@ -404,7 +420,9 @@ Authors:
 %endif
 
 %if %{with gnome}
+
 %package -n apparmorapplet-gnome
+License:        GPLv2 ; LGPLv2.1+
 Summary:        An AppArmor event notification applet for GNOME
 Group:          System/GUI/GNOME
 
@@ -431,6 +449,7 @@ SubDomain.
 %if %{with gnome}
 %lang_package -n apparmorapplet-gnome
 %endif
+
 %prep
 %setup -q
 %patch -p1
@@ -674,6 +693,7 @@ fi
 %{perl_vendorarch}/LibAppArmor.pm
 
 %if %{with python}
+
 %files -n python-apparmor
 %defattr(-,root,root)
 %{python_sitearch}/LibAppArmor-2.5.1-py2.7.egg-info
@@ -681,12 +701,14 @@ fi
 %endif
 
 %if %{with ruby}
+
 %files -n ruby-apparmor
 %defattr(-,root,root)
 %{_prefix}/%{rb_sitearch}/*
 %endif
 
 %if %{with pam}
+
 %files -n pam_apparmor
 %defattr(444,root,root,755)
 %attr(555,root,root) %{_libdir}/security/pam_apparmor.so
@@ -694,6 +716,7 @@ fi
 %endif
 
 %if %{with tomcat}
+
 %files -n tomcat_apparmor
 %defattr(-,root,root)
 %{CATALINA_HOME}/lib/%{JAR_FILE}
@@ -702,6 +725,7 @@ fi
 %endif
 
 %if %{with apache}
+
 %files -n apache2-mod_apparmor
 %defattr(-,root,root)
 %{apache_module_path}/mod_apparmor.so
@@ -710,12 +734,14 @@ fi
 %endif
 
 %if %{with dbus}
+
 %files dbus
 %defattr(0750, root, root)
 %{_bindir}/apparmor-dbus
 %endif
 
 %if %{with editor}
+
 %files profile-editor
 %defattr(-, root, root)
 %{_datadir}/applications/%{name}-profile-editor.desktop
@@ -729,6 +755,7 @@ fi
 %endif
 
 %if %{with gnome}
+
 %files -n apparmorapplet-gnome
 %defattr(-, root, root)
 %{_libdir}/bonobo/servers/*.server
@@ -790,13 +817,17 @@ fi
 %endif
 
 %post -n libapparmor1 -p /sbin/ldconfig
+
 %postun -n libapparmor1 -p /sbin/ldconfig
 %if %{with tomcat}
+
 %post -n tomcat_apparmor -p /sbin/ldconfig
+
 %postun -n tomcat_apparmor -p /sbin/ldconfig
 %endif
 
 %if %{with pam}
+
 %post -n pam_apparmor
 pam-config -a --apparmor
 pam-config --update