Accepting request 202791 from YaST:Head

Automatic submission by obs-autosubmit

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

yast2-apparmor-3.0.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f99d803e6cab5877579cdff6c6b4ebbe0ee2989e01dd90523a912d71639df73
-size 120727

yast2-apparmor-3.1.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29459c20a918725f80835bfb0d746ddb12963b252f64f72927f5237fcf8c907e
+size 49769

yast2-apparmor.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 18 10:45:06 UTC 2013 - lslezak@suse.cz
+
+- do not use *.spec.in template, use *.spec file with RPM macros
+  instead
+- 3.1.0
+
 -------------------------------------------------------------------
 Mon Aug 19 12:48:48 UTC 2013 - jreidinger@suse.com
 

yast2-apparmor.spec

@@ -17,11 +17,11 @@
 
 
 Name:           yast2-apparmor
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-apparmor-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.bz2
 
 Requires:       yast2-ruby-bindings >= 1.0.0
 
@@ -46,7 +46,7 @@ Provides:       yast2-subdomain
 BuildRequires:  update-desktop-files
 
 BuildRequires:  yast2
-BuildRequires:  yast2-devtools
+BuildRequires:  yast2-devtools >= 3.0.6
 
 %if 0%{?suse_version} >= 1140
 # openSUSE-11.4 or newer
@@ -62,50 +62,28 @@ This package is part of a suite of tools that used to be named
 SubDomain.
 
 %prep
-%setup -n yast2-apparmor-%{version}
+%setup -n %{name}-%{version}
 
 %build
-%{_prefix}/bin/y2tool y2autoconf
+%yast_build
-%{_prefix}/bin/y2tool y2automake
-autoreconf --force --install
-
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-
-./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
-# V=1: verbose build in case we used AM_SILENT_RULES(yes)
-# so that RPM_OPT_FLAGS check works
-make %{?jobs:-j%jobs} V=1
 
 %install
-make install DESTDIR="$RPM_BUILD_ROOT"
+%yast_install
-[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
-    d=${f##*/}
-    %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
 
 %files 
 %defattr(-,root,root)
 /usr/bin/*
-/usr/share/YaST2/clients
+%{yast_clientdir}
-/usr/share/YaST2/include/apparmor
+%{yast_yncludedir}/apparmor
-# empty directory, commenting out
+%{yast_scrconfdir}
-# /usr/share/YaST2/include/apparmor-reports
+%{yast_moduledir}
-/usr/share/YaST2/scrconf
+%{yast_desktopdir}
-/usr/share/YaST2/modules
+%{yast_agentdir}
-/usr/share/applications/YaST2
-/usr/lib/YaST2/servers_non_y2
 %dir %{perl_vendorlib}/Immunix
 %{perl_vendorlib}/Immunix/Notify.pm
-# license is questionable, PDB says GPL-2.0+
-#%doc COPYING.LGPL
 %dir %attr(-,root,root) /etc/apparmor
 %config(noreplace) /etc/apparmor/reports.crontab
 %config(noreplace) /etc/apparmor/reports.conf
-%doc %{_prefix}/share/doc/packages/yast2-apparmor
+%doc %{yast_docdir}
 
 %changelog