Author: jsrain Date: Wed Jan 9 17:31:33 2008 New Revision: 43503 URL: http://svn.opensuse.org/viewcvs/yast?rev=43503&view=rev Log: brought to state when package from SVN builds using YaST conventions Added: trunk/apparmor/src/agents/Makefile.am trunk/apparmor/src/apparmor/Makefile.am trunk/apparmor/src/bin/Makefile.am trunk/apparmor/src/clients/Makefile.am trunk/apparmor/src/desktop/Makefile.am trunk/apparmor/src/desktop/groups/Makefile.am trunk/apparmor/src/include/Makefile.am trunk/apparmor/src/include/subdomain/Makefile.am trunk/apparmor/src/modules/Makefile.am trunk/apparmor/src/perl/Makefile.am trunk/apparmor/src/scrconf/Makefile.am Removed: trunk/apparmor/src/immunix/ trunk/apparmor/src/include/apparmor-reports/ Modified: trunk/apparmor/src/Makefile.am trunk/apparmor/yast2-apparmor.spec.in Modified: trunk/apparmor/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/Makefile.am?rev=43503&r1=43502&r2=43503&view=diff ============================================================================== --- trunk/apparmor/src/Makefile.am (original) +++ trunk/apparmor/src/Makefile.am Wed Jan 9 17:31:33 2008 @@ -1 +1,5 @@ -SUBDIRS = agents apparmor bin clients desktop icons immunix include locale modules perl po scrconf +SUBDIRS = agents apparmor bin clients desktop include modules perl scrconf + +#icons belongs to yast2-theme packages +#locale belongs to yast2-trans-* packages +#po belongs to yast2-trans-* packages Added: trunk/apparmor/src/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/agents/Makefile.am (added) +++ trunk/apparmor/src/agents/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,15 @@ +agent_SCRIPTS = \ + ag_complain \ + ag_genprof \ + ag_logparse \ + ag_logprof \ + ag_reports_confined \ + ag_reports_ess \ + ag_reports_parse \ + ag_reports_sched \ + ag_sd_config \ + ag_subdomain \ + ag_subdomain_profiles + +EXTRA_DIST = $(agent_SCRIPTS) + Added: trunk/apparmor/src/apparmor/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/apparmor/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/apparmor/Makefile.am (added) +++ trunk/apparmor/src/apparmor/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,8 @@ +etc_DATA = \ + reports.conf \ + reports.crontab + +etcdir = /etc/apparmor + +EXTRA_DIST = $(etc_DATA) + Added: trunk/apparmor/src/bin/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/bin/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/bin/Makefile.am (added) +++ trunk/apparmor/src/bin/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,7 @@ +usrbin_DATA = \ + reportgen.pl + +usrbindir = /usr/bin/ + +EXTRA_DIST = $(usrbin_DATA) + Added: trunk/apparmor/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/clients/Makefile.am (added) +++ trunk/apparmor/src/clients/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,15 @@ +client_DATA = \ + GenProf.ycp \ + LogProf.ycp \ + SD_AddProfile.ycp \ + SD_DeleteProfile.ycp \ + SD_EditProfile.ycp \ + SD_Report.ycp \ + subdomain_no_impl.ycp \ + subdomain.ycp + +EXTRA_DIST = \ + $(client_DATA) + +include $(top_srcdir)/Makefile.am.common + Added: trunk/apparmor/src/desktop/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/desktop/Makefile.am (added) +++ trunk/apparmor/src/desktop/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,16 @@ +SUBDIRS = groups + +desktop_DATA = \ + SD_add_profile.desktop \ + SD_delete_profile.desktop \ + SD_genprof.desktop \ + SD_Reports.desktop \ + SD_control_panel.desktop \ + SD_edit_profile.desktop \ + SD_logprof.desktop + + +rncdir = $(schemadir)/autoyast/rnc +rnc_DATA = + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) Added: trunk/apparmor/src/desktop/groups/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/desktop/groups/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/desktop/groups/Makefile.am (added) +++ trunk/apparmor/src/desktop/groups/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,6 @@ +group_DATA = \ + apparmor.desktop + +groupdir = $(desktopdir)/groups + +EXTRA_DIST = $(group_DATA) Added: trunk/apparmor/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/include/Makefile.am (added) +++ trunk/apparmor/src/include/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1 @@ +SUBDIRS = subdomain Added: trunk/apparmor/src/include/subdomain/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/include/subdomain/Makefile.am (added) +++ trunk/apparmor/src/include/subdomain/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,19 @@ +yncludedir = @yncludedir@/subdomain + +ynclude_DATA = \ + apparmor_packages.ycp \ + apparmor_profile_check.ycp \ + apparmor_ycp_utils.ycp \ + capabilities.ycp \ + config_complain.ycp \ + event_notification_helptext.ycp \ + profile_dialogs.ycp \ + report_helptext.ycp \ + reporting_archived_dialogs.ycp \ + reporting_dialogues.ycp \ + reporting_utils.ycp \ + sd-config.ycp + +EXTRA_DIST = \ + $(ynclude_DATA) + Added: trunk/apparmor/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/modules/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/modules/Makefile.am (added) +++ trunk/apparmor/src/modules/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,10 @@ +YCPCFLAGS = -I . -M . + +module_DATA = \ + AppArmorDialogs.ycp + +EXTRA_DIST = \ + $(module_DATA) + +include $(top_srcdir)/Makefile.am.common + Added: trunk/apparmor/src/perl/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/perl/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/perl/Makefile.am (added) +++ trunk/apparmor/src/perl/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,7 @@ +perl_DATA = \ + Notify.pm + +perldir = /usr/lib/perl5/vendor_perl/Immunix + +EXTRA_DIST = $(perl_DATA) + Added: trunk/apparmor/src/scrconf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/scrconf/Makefile.am?rev=43503&view=auto ============================================================================== --- trunk/apparmor/src/scrconf/Makefile.am (added) +++ trunk/apparmor/src/scrconf/Makefile.am Wed Jan 9 17:31:33 2008 @@ -0,0 +1,15 @@ +scrconf_DATA = \ + complain.scr \ + genprof.scr \ + logparse.scr \ + logprof.scr \ + reports_confined.scr \ + reports_ess.scr \ + reports_parse.scr \ + reports_sched.scr \ + sdconf.scr \ + subdomain_profiles.scr \ + subdomain.scr + +EXTRA_DIST = $(scrconf_DATA) + Modified: trunk/apparmor/yast2-apparmor.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/yast2-apparmor.spec.in?rev=43503&r1=43502&r2=43503&view=diff ============================================================================== --- trunk/apparmor/yast2-apparmor.spec.in (original) +++ trunk/apparmor/yast2-apparmor.spec.in Wed Jan 9 17:31:33 2008 @@ -1,28 +1,8 @@ -# $Id: yast2-apparmor.spec.in 6363 2006-04-02 23:26:31Z dominic $ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# norootforbuild -# +@HEADER-COMMENT@ + +@HEADER@ + Summary: Yast2 plugins for AppArmor management -Name: yast2-apparmor -Version: @@immunix_version@@ -Release: @@repo_version@@ -Group: Productivity/Security -Source0: %{name}-%{version}-@@repo_version@@.tar.gz -License: GPL and LGPL -BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build -Url: http://forge.novell.com/modules/xfmod/project/?apparmor Requires: yast2 perl-TimeDate BuildArch: noarch Obsoletes: yast2-subdomain @@ -48,64 +28,35 @@ Yast2 forms and components for the management of Novell AppArmor profiles. This package is part of a suite of tools that used to be named SubDomain. -%prep +@PREP@ -%setup -q +@BUILD@ -%build -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} DISTRO=%{distro} - -%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 - 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 -done +@INSTALL@ -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT +@CLEAN@ %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 +# icons belong to yast2-theme-*, commenting out +#%{themedir}/icons +#/usr/share/icons/hicolor/ +# 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 @docdir@ %post REPDIR='/var/log/apparmor/reports' @@ -114,106 +65,3 @@ [ -e $REPDIR ] || mkdir -p $REPDIR [ -e $REPDIR2 ] || mkdir -p $REPDIR2 [ -e $REPDIR3 ] || mkdir -p $REPDIR3 - -%preun - -%changelog -* Tue Aug 14 2007 - sbeattie@suse.de -- Make icons display under yast-gnome (#212500, #297243) -* Mon Nov 13 2006 David Drewelow 2.0-7.12 -- Fixes for notification bugs (changed multiple files): - https://bugzilla.novell.com/show_bug.cgi?id=177039, - https://bugzilla.novell.com/show_bug.cgi?id=190891, - https://bugzilla.novell.com/show_bug.cgi?id=198359 -* Thu Oct 5 2006 Dominic Reynolds 2.0-7.11 -- Add syntax checks for profiles and display to user. -* Wed May 31 2006 Dominic Reynolds 2.0-7.10 -- 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. -* Sun Apr 2 2006 Dominic Reynolds 2.0-7.9 -- Fix typo regression in profile_dialogs.ycp -* Wed Mar 30 2006 Dominic Reynolds 2.0-7.9 -- Remove libapparmor as a dependency for all yast wizards (#160518) -* Sun Mar 26 2006 David Drewelow 2.0-7.9 -- Filter out html files in archived app. audit list: ag_reports_confined - Added some mixed l10n calls, fixed text to match yast spced: profile_dialogs.ycp - Removed confusing accept buttons in reporting_dialogs.ycp - Fixed bug in reportgen.pl related to accept buttons above - (#158261, #159732, #159734, #160271) -* Sun Mar 12 2006 Dominic Reynolds 2.0-7.8 -- Don't check for event DB intialization when running the audit report. - (#155343) -* Fri Mar 10 2006 Dominic Reynolds 2.0-7.7 -- Remove localized text in apparmor.desktop - as the desktop translation - is handled by the translation group. - https://bugzilla.novell.com/show_bug.cgi?id=151509 -* Sun Mar 5 2006 Dominic Reynolds 2.0-7.6 -- Changes the checks from /etc/subdomain.d to /etc/apparmor.d when - validated manual selection of #includes in the "Edit Profile" wizard. -- Replace yast2-devel build-requires -* Fri Feb 10 2006 Dominic Reynolds 2.0-7.5 -- Include counter (and time) in ag_genprof logmark -* Wed Feb 8 2006 Steve Beattie 2.0-7.4 -- Install apparmor packages if not already installed (#137585) -- Remove direct dependency on apparmor packages -* Sun Feb 5 2006 Steve Beattie 2.0-7.3 -- Enable/start aaeventd if notification is enabled -- (jmichael) Remove some dead code -* Tue Jan 31 2006 Steve Beattie 2.0-7.1 -- Fix non-wrapping error-dialog (#146435) -* Fri Jan 27 2006 Dominic Reynolds 2.0-5 -- Added code to process events from the audit system in addition to syslog -- Removed AALite checks -- Fix regex warning -- Fix apparmor control panel to correctly tell if AA is enabled/disabled (#145955) -- (smb) disable autoyast support in aa configs (#116749) -* Mon Jan 16 2006 Dominic Reynolds 2.0-4 -- Remove references to message catalog files - now provided by yast2-trans -* Wed Jan 4 2006 Steve Beattie 2.0-3 -- Add svn repo to tarball -* Thu Dec 8 2005 Steve Beattie 2.0-2 -- fix gettext/textdomain() calls to refer to new messages filename -- fix references to old package names within .po files -* Wed Dec 7 2005 Steve Beattie 2.0-1 -- Reset version for inclusion in SUSE autobuild -* Wed Nov 30 2005 Steve Beattie 1.2-13 -- Rename package to yast2-apparmor -* Mon Nov 28 2005 Dominic Reynolds 1.2-12_imnx -- Changes to licenses for open source release -* Fri Sep 2 2005 Jesse Michael 1.2-11_imnx -- fix control panel to enable and disable subdomain correctly -* Wed Aug 17 2005 Jesse Michael 1.2-10_imnx -- move perl modules from site_perl to vendor_perl -* Fri Aug 6 2005 David Drewelow 1.2-9_imnx -- Added suse registration lines in %install -* Thu Aug 5 2005 Dominic Reynolds 1.2-9_imnx -- Removed dependency for subdomain-master for SuSE 10.0 -* Wed Jul 6 2005 David Drewelow 1.2-7_imnx -- added /var/log/apparmor/reports-exported -* Sun May 22 2005 David Drewelow 1.2-5_imnx -- removed /var/log/apparmor/reports-scheduled -* Thu May 19 2005 David Drewelow 1.2-5_imnx -- moved /etc/cron.d/reportsched to /etc/apparmor/reports.crontab -* Thu May 19 2005 David Drewelow 1.2-5_imnx -- added REPDIR3 -* Mon May 16 2005 David Drewelow 1.2-5_imnx -- renamed /var/log/immunix/* to /var/log/apparmor/* -* Mon Mar 14 2005 David Drewelow 1.2-5_imnx -- moved /etc/immunix/reports.conf here from subdomain-utils -* Mon Mar 14 2005 Steve Beattie 1.2-5_imnx -- renamed subdomain_parser package to subdomain-parser -* Thu Mar 10 2005 David Drewelow 1.2-3_imnx -- Added immunix/reports-archived -* Mon Feb 28 2005 David Drewelow 1.2-3_imnx -- Added /usr/bin/*, /etc/cron.d/* scripts -* Fri Feb 4 2005 Seth Arnold 1.2-1_imnx -- Reversion to 1.2 -* Sun Jan 09 2005 Dominic Reynolds 1.1-4_imnx -- Added 22x22 Icons -* Wed Nov 10 2004 Steve Beattie 1.1-2_imnx -- Merge in new-style build infrastructure. -* Tue Oct 12 2004 Steve Beattie 1.1-1_imnx -- bump version for shass-1.1 release -* Wed Jul 21 2004 Dominic Reynolds 1.0-1_imnx -- Initial release -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org