- partial cleanup, .so perms

Changed files:
    avant-window-navigator-extras.spec -> 1.3

diff --git a/avant-window-navigator-extras.spec b/avant-window-navigator-extras.spec
index c7dac619303df056d84c546498ba92e911c11dea..70f4736b3de72a1753870737ee9f32889c62586b 100644 (file)
--- a/avant-window-navigator-extras.spec
+++ b/avant-window-navigator-extras.spec
@@ -6,23 +6,21 @@
 # - make applets subpackage suggest all the applets
 #
 %define snap 20071024
-%define _basename avant-window-navigator
-%define _realname awn-extras
 Summary:       Extra applets and plugins for awn
-Summary(pl.UTF-8):Dodatkowe applety i wtyczki dla awn
-Name:          %{_basename}-extras
+Summary(pl.UTF-8):     Dodatkowe applety i wtyczki dla awn
+Name:          avant-window-navigator-extras
 Version:       0.2.%{snap}
 Release:       0.1
 License:       GPLv2
 Group:         X11/Applications
 #Source0:      http://avant-window-navigator.googlecode.com/files/%{name}-%{version}-2.tar.gz
-Source0:       %{_realname}-%{snap}.tar.bz2
+Source0:       awn-extras-%{snap}.tar.bz2
 # Source0-md5: e27eba8b4aa03ff44c82f1975b1170a6
 URL:           https://launchpad.net/awn-extras/
-BuildRequires: %{_basename}-devel
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: avant-window-navigator-devel
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.12.0
 BuildRequires: gnome-desktop-devel
@@ -37,50 +35,46 @@ BuildRequires:      libtool
 BuildRequires: libwnck-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): gtk+2 >= 2:2.10.0
-Requires(post,preun):  GConf2 >= 2.14.0
+#Requires(post,preun): GConf2 >= 2.14.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define     _appletsdir     %{_libdir}/awn/applets
+%define                awn_appletsdir  %{_libdir}/awn/applets
+
 %description
-Generic package for all core awn-plugins.
+Extra applets and plugins for awn.
 
 %description -l pl.UTF-8
-Paczka wspólna dla wszystkich głównym wtyczek dla awn.
+Dodatkowe applety i wtyczki dla awn.
 
-%package -n %{_basename}-core-applets
+%package -n avant-window-navigator-core-applets
 Summary:       Core applets for awn
-Summary(pl.UTF-8):Kluczowe applety dla awn
+Summary(pl.UTF-8):     Kluczowe aplety dla awn
 Group:         X11/Applications
-Requires:      %{_basename} = %{version}
+Requires:      avant-window-navigator = %{version}
 
-%description -n %{_basename}-core-applets
+%description -n avant-window-navigator-core-applets
 Core applets for awn.
 
-%description -n %{_basename}-core-applets -l pl.UTF-8
-Kluczowe applety dla awn.
+%description -n avant-window-navigator-core-applets -l pl.UTF-8
+Kluczowe aplety dla awn.
 
-%package -n %{_basename}-plugins
+%package -n avant-window-navigator-plugins
 Summary:       Pluggins for awn
-Summary(pl.UTF-8):Wtyczki dla awn
+Summary(pl.UTF-8):     Wtyczki dla awn
 Group:         X11/Applications
-Requires:      %{_basename} = %{version}-%{release}
+Requires:      avant-window-navigator = %{version}
 
-%description -n %{_basename}-plugins
+%description -n avant-window-navigator-plugins
 Pluggins for awn.
 
-%description -n %{_basename}-plugins -l pl.UTF-8
+%description -n avant-window-navigator-plugins -l pl.UTF-8
 Wtyczki dla awn.
 
 %prep
-%setup -q -n %{_realname}-%{snap}
+%setup -q -n awn-extras-%{snap}
 
 %build
-
-###
 # awn-applets core
-###
 cd awn-applets/awn-core-applets
 %{__intltoolize}
 %{__libtoolize}
@@ -95,87 +89,97 @@ cd awn-applets/awn-core-applets
 %install
 rm -rf $RPM_BUILD_ROOT
 
-###
 # awn-applets core
-###
-cd awn-applets/awn-core-applets
-%{__make} install \
+%{__make} -C awn-applets/awn-core-applets install \
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-###
 # awn-plugins
-###
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 #%%post
 #%%gconf_schema_install %{name}.schemas
-#/sbin/ldconfig
 
 #%%preun
 #%%gconf_schema_uninstall switcher.schemas trash.schemas
 
-#%%postun
-#/sbin/ldconfig
-
-%files -n %{_basename}-core-applets
+%files -n avant-window-navigator-core-applets
 %defattr(644,root,root,755)
 #%{_sysconfdir}/gconf/schemas/*.schemas
+%dir %{_datadir}/awn-core-applets
+
+%dir %{awn_appletsdir}/awnnotificationdaemon
+%attr(755,root,root) %{awn_appletsdir}/awnnotificationdaemon/awnnotificationdaemon.so
+%{awn_appletsdir}/awnnotificationdaemon.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.Notifications.service
-%dir %{_appletsdir}/awnnotificationdaemon
-%{_appletsdir}/awnnotificationdaemon/awnnotificationdaemon.so
-%{_appletsdir}/awnnotificationdaemon.desktop
-%dir %{_appletsdir}/awnsystemmonitor
-%{_appletsdir}/awnsystemmonitor/awnsystemmonitor.so
-%{_appletsdir}/awn-system-monitor.desktop
-%{_appletsdir}/battery-applet
-%{_appletsdir}/battery-applet.desktop
-%dir %{_appletsdir}/mainmenu
-%{_appletsdir}/BlingSwitcher
-%{_appletsdir}/PySwitcher.desktop
-%dir %{_appletsdir}/clock
-%{_appletsdir}/clock/clock.so
-%{_appletsdir}/clock.desktop
-%dir %{_appletsdir}/filebrowser
-%{_appletsdir}/filebrowser/filebrowser.so
-%{_appletsdir}/filebrowser.desktop
+
+%dir %{awn_appletsdir}/awnsystemmonitor
+%attr(755,root,root) %{awn_appletsdir}/awnsystemmonitor/awnsystemmonitor.so
+%{awn_appletsdir}/awn-system-monitor.desktop
+
+%{awn_appletsdir}/battery-applet
+%{awn_appletsdir}/battery-applet.desktop
+
+%{awn_appletsdir}/BlingSwitcher
+%{awn_appletsdir}/PySwitcher.desktop
+
+%dir %{awn_appletsdir}/clock
+%attr(755,root,root) %{awn_appletsdir}/clock/clock.so
+%{awn_appletsdir}/clock.desktop
+
+%dir %{awn_appletsdir}/filebrowser
+%attr(755,root,root) %{awn_appletsdir}/filebrowser/filebrowser.so
+%{awn_appletsdir}/filebrowser.desktop
 %{_datadir}/awn-core-applets/filebrowser.svg
-%{_appletsdir}/gmail
-%{_appletsdir}/awngmail.desktop
-%dir %{_appletsdir}/mainmenu
-%{_appletsdir}/mainmenu/mainmenu.so
-%{_appletsdir}/main-menu.desktop
-%{_appletsdir}/media-control
-%{_appletsdir}/media-control.desktop
-%{_appletsdir}/media-icon-*
-%{_appletsdir}/medialogo*.desktop
-%dir %{_appletsdir}/notification-area
-%{_appletsdir}/notification-area/notification-area.so
-%{_appletsdir}/notification-area.desktop
-%{_appletsdir}/quit-applet
-%{_appletsdir}/quit-applet.desktop
+
+%{awn_appletsdir}/gmail
+%{awn_appletsdir}/awngmail.desktop
+
+%dir %{awn_appletsdir}/mainmenu
+%attr(755,root,root) %{awn_appletsdir}/mainmenu/mainmenu.so
+%{awn_appletsdir}/main-menu.desktop
+
+%{awn_appletsdir}/media-control
+%{awn_appletsdir}/media-control.desktop
+%{awn_appletsdir}/media-icon-*
+%{awn_appletsdir}/medialogo*.desktop
+
+%dir %{awn_appletsdir}/notification-area
+%attr(755,root,root) %{awn_appletsdir}/notification-area/notification-area.so
+%{awn_appletsdir}/notification-area.desktop
 %{_datadir}/awn-core-applets/notification.svg
-%dir %{_appletsdir}/separator
-%{_appletsdir}/separator/separator.so
-%{_appletsdir}/separator.desktop
+
+%{awn_appletsdir}/quit-applet
+%{awn_appletsdir}/quit-applet.desktop
+
+%dir %{awn_appletsdir}/separator
+%attr(755,root,root) %{awn_appletsdir}/separator/separator.so
+%{awn_appletsdir}/separator.desktop
 %{_datadir}/awn-core-applets/separator.svg
-%{_appletsdir}/showdesktop
-%{_appletsdir}/showdesktop.desktop
-%{_appletsdir}/stacks
-%{_appletsdir}/stacks.desktop
-%dir %{_appletsdir}/switcher
-%{_appletsdir}/switcher/switcher.so
-%{_appletsdir}/switcher.desktop
-%dir %{_appletsdir}/trash
-%{_appletsdir}/trash/trashapplet.glade
-%{_appletsdir}/trash/trash.so
-%{_appletsdir}/trash.desktop
-%{_appletsdir}/volume-control
-%{_appletsdir}/volume-control.desktop
-%{_appletsdir}/weather
-%{_appletsdir}/weather.desktop
-%dir %{_appletsdir}/wobblyzini
-%{_appletsdir}/wobblyzini/wobblyzini.so
-%{_appletsdir}/wobblyzini.desktop
+
+%{awn_appletsdir}/showdesktop
+%{awn_appletsdir}/showdesktop.desktop
+
+%{awn_appletsdir}/stacks
+%{awn_appletsdir}/stacks.desktop
+
+%dir %{awn_appletsdir}/switcher
+%attr(755,root,root) %{awn_appletsdir}/switcher/switcher.so
+%{awn_appletsdir}/switcher.desktop
+
+%dir %{awn_appletsdir}/trash
+%{awn_appletsdir}/trash/trashapplet.glade
+%attr(755,root,root) %{awn_appletsdir}/trash/trash.so
+%{awn_appletsdir}/trash.desktop
+
+%{awn_appletsdir}/volume-control
+%{awn_appletsdir}/volume-control.desktop
+
+%{awn_appletsdir}/weather
+%{awn_appletsdir}/weather.desktop
+
+%dir %{awn_appletsdir}/wobblyzini
+%attr(755,root,root) %{awn_appletsdir}/wobblyzini/wobblyzini.so
+%{awn_appletsdir}/wobblyzini.desktop