diff --git a/yast2-apparmor-2.1-977.tar.gz b/yast2-apparmor-2.1-977.tar.gz deleted file mode 100644 index d1d458c..0000000 --- a/yast2-apparmor-2.1-977.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:716ca60d4ccc772642c52f2b7c8aa38b0246f962fc0a6ed428625bbea4083d43 -size 297845 diff --git a/yast2-apparmor-2.16.0.tar.bz2 b/yast2-apparmor-2.16.0.tar.bz2 new file mode 100644 index 0000000..ad15b9b --- /dev/null +++ b/yast2-apparmor-2.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5907c6a00694102415b99e7e5a72bde6cd065ea96a656d1d9a3373029cc74d2c +size 171544 diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes index 53926b1..5296aa1 100644 --- a/yast2-apparmor.changes +++ b/yast2-apparmor.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 22 14:32:55 CET 2008 - kmachalkova@suse.cz + +- Icons moved to yast2-theme package +- 2.16.0 + ------------------------------------------------------------------- Mon Sep 17 06:01:09 CEST 2007 - dreynolds@suse.de diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec index 5dbcd53..e313041 100644 --- a/yast2-apparmor.spec +++ b/yast2-apparmor.spec @@ -1,7 +1,7 @@ # -# spec file for package yast2-apparmor (Version 2.1) +# spec file for package yast2-apparmor (Version 2.16.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,34 +10,23 @@ # norootforbuild -Name: yast2-apparmor -Summary: YaST2 - Plugins for AppArmor Profile Management -Version: 2.1 -Release: 19 -Group: Productivity/Security -Source0: %{name}-%{version}-977.tar.gz -License: GPL v2 or later -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://forge.novell.com/modules/xfmod/project/?apparmor + +Name: yast2-apparmor +Version: 2.16.0 +Release: 1 +License: GPL v2 or later +Group: Productivity/Security +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-apparmor-2.16.0.tar.bz2 +Prefix: /usr +Summary: YaST2 - Plugins for AppArmor Profile Management Requires: yast2 perl-TimeDate BuildArch: noarch Obsoletes: yast2-subdomain Provides: yast2-subdomain BuildRequires: update-desktop-files BuildRequires: yast2 yast2-devtools -%if %{suse_version} > 1010 -BuildRequires: yast2-theme-openSUSE -%define themedir /usr/share/YaST2/theme/openSUSE -%else - %if %{suse_version} > 1000 - %if 0%{?sles_version} > 9 -BuildRequires: yast2-theme-NLD - %else -BuildRequires: yast2-theme-SuSELinux - %endif - %endif -%define themedir /usr/share/YaST2/theme/SuSELinux -%endif %description Yast2 forms and components for the management of Novell AppArmor @@ -55,60 +44,47 @@ Authors: jmichael@suse.de %prep -%setup -q +%setup -n yast2-apparmor-2.16.0 %build -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} +%{prefix}/bin/y2tool y2autoconf +%{prefix}/bin/y2tool y2automake +autoreconf --force --install +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +%{?suse_update_config:%{suse_update_config -f}} +./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +make %{?jobs:-j%jobs} %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} THEMEDIR=%{themedir} -# Register as SuSE app -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +make install DESTDIR="$RPM_BUILD_ROOT" +[ -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##*/} - if [ "%{suse_version}" -lt 930 ] ; then - %suse_update_desktop_file ${d%.desktop} - else - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} - fi -done -# make icons available to GNOME control center (hicolor theme) -# (bug #212500) -mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/22x22/apps -mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/32x32/apps -mkdir -p ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/48x48/apps -cd $RPM_BUILD_ROOT/%{themedir}/icons -for dir in 22x22 32x32 48x48; do - cd $RPM_BUILD_ROOT/%{themedir}/icons/${dir}/apps - icons=$(ls *.png) - cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/${dir}/apps - for icon in ${icons}; do - ln -s %{themedir}/icons/${dir}/apps/${icon} . - done + %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +%clean +rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) /usr/bin/* /usr/share/YaST2/clients /usr/share/YaST2/include/subdomain -/usr/share/YaST2/include/apparmor-reports +# empty directory, commenting out +# /usr/share/YaST2/include/apparmor-reports /usr/share/YaST2/scrconf /usr/share/YaST2/modules /usr/share/applications/YaST2 -/usr/share/applications/YaST2/groups /usr/lib/YaST2/servers_non_y2 /usr/lib/perl5/vendor_perl/* -%{themedir}/icons -/usr/share/icons/hicolor/ -%doc COPYING.LGPL +# license is questionable, PDB says GPL v2 or later +#%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 %post REPDIR='/var/log/apparmor/reports' @@ -117,36 +93,36 @@ REPDIR3='/var/log/apparmor/reports-exported' [ -e $REPDIR ] || mkdir -p $REPDIR [ -e $REPDIR2 ] || mkdir -p $REPDIR2 [ -e $REPDIR3 ] || mkdir -p $REPDIR3 - -%preun - %changelog -* Mon Sep 17 2007 - dreynolds@suse.de +* Tue Jan 22 2008 kmachalkova@suse.cz +- Icons moved to yast2-theme package +- 2.16.0 +* Mon Sep 17 2007 dreynolds@suse.de - Fixes (#310454) to support new audit log format and new libapparmor1 - ddrewelow@suse.de - Bug #305735 Add support for network toggles, append, and locking to the YaST2 EditProfile wizard. - Bug 302588 - 1 CD KDE version fails to install apparmor-docs -* Tue Aug 21 2007 - dreynolds@suse.de +* Tue Aug 21 2007 dreynolds@suse.de - Updated spec to set theme-dir based on dist (openSUSE/sles) -* Mon Aug 20 2007 - dreynolds@suse.de +* Mon Aug 20 2007 dreynolds@suse.de - sbeattie@suse.de Fix for #212500 "y2controlcenter-gnome does not find AppArmor icons" and its duplicate #297243 "Missing YaST icon: All app armor icons". -* Mon Jul 30 2007 - dreynolds@suse.de +* Mon Jul 30 2007 dreynolds@suse.de - Numerous fixes for repository integration -* Mon Jul 16 2007 - dreynolds@suse.de +* Mon Jul 16 2007 dreynolds@suse.de - Add support for the AppArmor profile repository Fate: 300517 -* Sat Nov 18 2006 - ddrewelow@suse.de +* Sat Nov 18 2006 ddrewelow@suse.de - Fixed an untranslated string -* Sat Nov 18 2006 - ddrewelow@suse.de +* Sat Nov 18 2006 ddrewelow@suse.de - Fixed usability and reporting bugs (bnc# 158599,171082,172624,173825) -* Tue Nov 14 2006 - ddrewelow@suse.de +* Wed Nov 15 2006 ddrewelow@suse.de - Added the missing complain.scr to fix: https://bugzilla.novell.com/show_bug.cgi?id=219898 -* Mon Nov 13 2006 - ddrewelow@suse.de +* Tue Nov 14 2006 ddrewelow@suse.de - Fixes for notification bugs: - configuration of e-mail recipient not saved in YaST (bnc#177039) @@ -154,28 +130,28 @@ REPDIR3='/var/log/apparmor/reports-exported' (bnc#190891) - AppArmor unable to enter ANY notification email address (bnc#198359) -* Sat Nov 04 2006 - ddrewelow@suse.de +* Sat Nov 04 2006 ddrewelow@suse.de - Add complain/enforce profile state toggle Fate: 300719 -* Mon Oct 16 2006 - dreynolds@suse.de +* Mon Oct 16 2006 dreynolds@suse.de - Add syntax checks for profiles and display error dialogs to user Fate: 300906 -* Tue Sep 19 2006 - aj@suse.de +* Tue Sep 19 2006 aj@suse.de - Adjust for theming change. -* Tue Jun 06 2006 - dreynolds@suse.de +* Tue Jun 06 2006 dreynolds@suse.de - Fixes for https://bugzilla.novell.com/show_bug.cgi?id=175388, https://bugzilla.novell.com/show_bug.cgi?id=172061. Added support for new profile syntax Px/Ux/m. -* Mon Apr 03 2006 - dreynolds@suse.de +* Mon Apr 03 2006 dreynolds@suse.de - Pickup fix for typo regression in profile_dialogs.ycp (thanks rudi) - Remove libapparmor as a dependency for all yast wizards (#160518) -* Sun Apr 02 2006 - ro@suse.de +* Sun Apr 02 2006 ro@suse.de - fix typo in subdomain/profile_dialogs.ycp -* Mon Mar 27 2006 - jmichael@suse.de +* Mon Mar 27 2006 jmichael@suse.de - Split aaeventd startup into its own init script so we don't start daemons while in the "boot" runlevel (#158613) - Fix broken notification help localization. -* Mon Mar 13 2006 - dreynolds@suse.de +* Mon Mar 13 2006 dreynolds@suse.de - Don't check for event DB intialization when running the audit report. (#155343) - Remove localized text in apparmor.desktop - as the desktop translation @@ -185,33 +161,33 @@ REPDIR3='/var/log/apparmor/reports-exported' validated manual selection of #includes in the "Edit Profile" wizard. (#152813) - Replace yast2-devel build-requires with yast2 yast2-devtools -* Wed Feb 15 2006 - dreynolds@suse.de +* Wed Feb 15 2006 dreynolds@suse.de - Fixed typo in SD_EditProfie.ycp that was causing a syntax error in the wizard -* Mon Feb 13 2006 - dreynolds@suse.de +* Mon Feb 13 2006 dreynolds@suse.de - Include counter (and time) in ag_genprof logmark - (sbeattie@suse.de) Install apparmor packages if not already installed (#137585) - (sbeattie@suse.de) Remove direct dependency on apparmor packages -* Mon Feb 06 2006 - sbeattie@suse.de +* Mon Feb 06 2006 sbeattie@suse.de - Fix non-wrapping error-dialog (#146435) - Enable/start aaeventd if notification is enabled - (jmichael) Remove dead code -* Sun Jan 29 2006 - sbeattie@suse.de +* Sun Jan 29 2006 sbeattie@suse.de - Add svn repo number to tarball name - (dreynolds) Removed AALite checks - (dreynolds) Fix regex warning - (dreynolds) Fix apparmor control panel to correctly tell if AA is enabled/disabled (#145955) - disable autoyast support in aa configs (#116749) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 - dreynolds@suse.de +* Mon Jan 23 2006 dreynolds@suse.de - Added code to process events from the audit system in addition to syslog -* Tue Jan 17 2006 - dreynolds@suse.de +* Tue Jan 17 2006 dreynolds@suse.de - Remove references to message catalog files - now provided by yast2-trans -* Fri Dec 09 2005 - sbeattie@suse.de +* Fri Dec 09 2005 sbeattie@suse.de - fix gettext/textdomain() calls to refer to new messages filename - fix references to old package names within .po files -* Thu Dec 08 2005 - sbeattie@suse.de +* Thu Dec 08 2005 sbeattie@suse.de - rename package to yast2-apparmor - relicense to GPL and LGPL for open source release - reset version to 2.0-1