summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2005-02-01 18:43:44 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2005-02-01 18:43:44 +0000
commitadd8d367b8f6e5aa5c5550ff10b7d4c9e5e14bbb (patch)
tree4fbd3c5e422604fd682406876c34f14bbae43ae0
parentecf72008efb70a07a103373dade10e791729973e (diff)
downloadgnome-applets-add8d367b8f6e5aa5c5550ff10b7d4c9e5e14bbb.tar.gz
gnome-applets-add8d367b8f6e5aa5c5550ff10b7d4c9e5e14bbb.tar.xz
gnome-applets-add8d367b8f6e5aa5c5550ff10b7d4c9e5e14bbb.zip
Adjust file paths, use DESTDIR instead of %makeinstall
-rw-r--r--gnome-applets.spec16
1 files changed, 4 insertions, 12 deletions
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 51768bf..e21e235 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -27,8 +27,6 @@ URL: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Patch0: gnome-applets-2.9.5-paths.patch
-
Prereq: scrollkeeper >= 0.1.4
BuildRequires: glib2-devel >= %{glib2_version}
@@ -70,7 +68,6 @@ fi
%endif
%setup -q
-%patch0 -p1 -b .paths
cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png
@@ -89,7 +86,7 @@ make
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
%find_lang %{po_package}
@@ -121,26 +118,21 @@ done
%doc AUTHORS COPYING ChangeLog NEWS README
+%{_datadir}/pixmaps
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome/gkb
-%{_datadir}/gnome/help/*
-%{_datadir}/geyes
+%{_datadir}/gnome
+%{_datadir}/gnome-applets
%{_datadir}/xmodmap
-%{_datadir}/gweather
-%{_datadir}/stickynotes
%ifarch %{apmd_archs}
%{_datadir}/battstat_applet
%endif
-%{_datadir}/gswitchit
%{_datadir}/omf/gnome-applets
-%{_datadir}/gen_util
%{_bindir}/*
%{_libdir}/bonobo/servers/*
%{_libexecdir}/*
#%{_libdir}/*.so.*
%{_sysconfdir}/gconf/schemas/*
-%{_sysconfdir}/sound/events/*
# These are really devel files, but we don't want a devel package
# for just three files