From 306ef1c9a8b8be8ef73ef25aa12d34d7b96e3553 Mon Sep 17 00:00:00 2001 From: Matt Barringer Date: Mon, 30 Jul 2007 02:09:56 +0000 Subject: [PATCH] - Had to add dbus-glib-lowlevel.h header to build on 10.3 - Cleaned up the install part of the makefile --- .../applets/apparmorapplet-gnome/Makefile.am | 23 ---------- .../applets/apparmorapplet-gnome/Makefile.in | 45 +++++-------------- .../apparmorapplet-gnome.spec | 3 ++ .../apparmorapplet-gnome/pixmaps/Makefile | 4 +- .../apparmorapplet-gnome/pixmaps/Makefile.am | 2 +- .../apparmorapplet-gnome/pixmaps/Makefile.in | 2 +- .../src/apparmor-applet.c | 4 +- 7 files changed, 20 insertions(+), 63 deletions(-) diff --git a/management/applets/apparmorapplet-gnome/Makefile.am b/management/applets/apparmorapplet-gnome/Makefile.am index 2a1dfad2f..da4727ebe 100644 --- a/management/applets/apparmorapplet-gnome/Makefile.am +++ b/management/applets/apparmorapplet-gnome/Makefile.am @@ -6,29 +6,6 @@ EXTRA_DIST = \ autogen.sh \ AppArmor_Monitor_Factory.server.in - -install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - $(INSTALL_DATA) $$pixmap $(pixmapsdir); \ - fi \ - done \ - fi - -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in pixmaps/*; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi - - serverdir = $(libdir)/bonobo/servers server_in_files = AppArmor_Monitor_Factory.server.in server_DATA = AppArmor_Monitor_Factory.server diff --git a/management/applets/apparmorapplet-gnome/Makefile.in b/management/applets/apparmorapplet-gnome/Makefile.in index 05937af0b..03db11e57 100644 --- a/management/applets/apparmorapplet-gnome/Makefile.in +++ b/management/applets/apparmorapplet-gnome/Makefile.in @@ -472,9 +472,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -624,7 +621,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-serverDATA +install-data-am: install-serverDATA install-exec-am: @@ -659,41 +656,19 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ check-am clean clean-generic clean-libtool clean-recursive \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-serverDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-serverDATA + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-serverDATA install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am uninstall-serverDATA - -install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/pixmaps; then \ - $(mkinstalldirs) $(DESTDIR)/pixmaps; \ - for pixmap in $(srcdir)/pixmaps/*; do \ - if test -f $$pixmap; then \ - $(INSTALL_DATA) $$pixmap $(pixmapsdir); \ - fi \ - done \ - fi - -dist-hook: - if test -d pixmaps; then \ - mkdir $(distdir)/pixmaps; \ - for pixmap in pixmaps/*; do \ - if test -f $$pixmap; then \ - cp -p $$pixmap $(distdir)/pixmaps; \ - fi \ - done \ - fi AppArmor_Monitor_Factory.server: sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" < AppArmor_Monitor_Factory.server.in > AppArmor_Monitor_Factory.server # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/management/applets/apparmorapplet-gnome/apparmorapplet-gnome.spec b/management/applets/apparmorapplet-gnome/apparmorapplet-gnome.spec index 6cae6b7ff..9b8fb22f1 100644 --- a/management/applets/apparmorapplet-gnome/apparmorapplet-gnome.spec +++ b/management/applets/apparmorapplet-gnome/apparmorapplet-gnome.spec @@ -14,6 +14,8 @@ Group: System/GUI/Gnome Requires: apparmor-dbus BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 +Summary: An AppArmor event notification applet for GNOME +License: GPL %description - @@ -38,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/bonobo/servers/*.server %{_prefix}/lib/apparmorapplet +%{_datadir}/pixmaps/* %changelog - diff --git a/management/applets/apparmorapplet-gnome/pixmaps/Makefile b/management/applets/apparmorapplet-gnome/pixmaps/Makefile index e35af9c4e..9cdc44f60 100644 --- a/management/applets/apparmorapplet-gnome/pixmaps/Makefile +++ b/management/applets/apparmorapplet-gnome/pixmaps/Makefile @@ -165,7 +165,7 @@ includedir = ${prefix}/include infodir = ${datarootdir}/info install_sh = /home/work/forge/trunk/management/applets/apparmorapplet-gnome/install-sh libdir = ${exec_prefix}/lib -libexecdir = /usr/lib/apparmorapplet +libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var mandir = ${datarootdir}/man @@ -180,7 +180,7 @@ sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com sysconfdir = ${prefix}/etc target_alias = -apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@ +apparmor_applet_pixmapsdir = $(pixmapsdir) apparmor_applet_pixmaps_DATA = \ apparmor_alert.png apparmor_default.png diff --git a/management/applets/apparmorapplet-gnome/pixmaps/Makefile.am b/management/applets/apparmorapplet-gnome/pixmaps/Makefile.am index 452c57cc7..6d76b6ed3 100644 --- a/management/applets/apparmorapplet-gnome/pixmaps/Makefile.am +++ b/management/applets/apparmorapplet-gnome/pixmaps/Makefile.am @@ -1,4 +1,4 @@ -apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@ +apparmor_applet_pixmapsdir = $(pixmapsdir) apparmor_applet_pixmaps_DATA = \ apparmor_alert.png apparmor_default.png diff --git a/management/applets/apparmorapplet-gnome/pixmaps/Makefile.in b/management/applets/apparmorapplet-gnome/pixmaps/Makefile.in index ad6cca153..640a7e17c 100644 --- a/management/applets/apparmorapplet-gnome/pixmaps/Makefile.in +++ b/management/applets/apparmorapplet-gnome/pixmaps/Makefile.in @@ -180,7 +180,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -apparmor_applet_pixmapsdir = $(prefix)/@NO_PREFIX_PACKAGE_PIXMAPS_DIR@ +apparmor_applet_pixmapsdir = $(pixmapsdir) apparmor_applet_pixmaps_DATA = \ apparmor_alert.png apparmor_default.png diff --git a/management/applets/apparmorapplet-gnome/src/apparmor-applet.c b/management/applets/apparmorapplet-gnome/src/apparmor-applet.c index 6622daec3..726612bb9 100644 --- a/management/applets/apparmorapplet-gnome/src/apparmor-applet.c +++ b/management/applets/apparmorapplet-gnome/src/apparmor-applet.c @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include #include "preferences_dialog.h" #include "reject_list.h" @@ -285,7 +287,7 @@ void applet_about(BonoboUIComponent * uic) g_object_new(GTK_TYPE_ABOUT_DIALOG, "authors", authors, "logo", GDK_PIXBUF(apparmor_applet->icon), - "copyright", ("Copyright (C) 2006 Novell"), + "copyright", ("Copyright (C) 2007 Novell"), "name", ("AppArmor Alert Applet"), "version", VERSION, "license", license,