- cleanup

- macros

Changed files:
    desktop-wallpapers.spec -> 1.6

diff --git a/desktop-wallpapers.spec b/desktop-wallpapers.spec
index 1d17e656336ed10de887a2fe8a645f5ec121611b..070c3b3b4bcff6543b9be8c0a064356657125111 100644 (file)
--- a/desktop-wallpapers.spec
+++ b/desktop-wallpapers.spec
@@ -1,46 +1,46 @@
-%define  ver     1.0.0
-%define  rel     6
-%define  prefix  /usr
-
-Summary: Desktop Background Images.
-Name: desktop-backgrounds
-Version: %ver
-Release: %rel
-Copyright: LGPL
-Group: Applications/Multimedia
-Source: space-1.0.0.tar.gz
-Source1: gnome-tiles-1.0.0.tar.gz
-Source2: Propaganda-1.0.0.tar.gz
-Source3: README.Propaganda
-Source4: README.space
-Source5: PHOTO_FAQ.ps
-
+Summary:       Desktop Background Images.
+Name:          desktop-backgrounds
+Version:       1.0.0
+Release:       6
+Copyright:     LGPL
+Group:         Applications/Multimedia
+Source:                space-1.0.0.tar.gz
+Source1:       gnome-tiles-1.0.0.tar.gz
+Source2:       Propaganda-1.0.0.tar.gz
+Source3:       README.Propaganda.gz
+Source4:       README.space.gz
+Source5:       PHOTO_FAQ.ps.gz
 BuildRoot:     /tmp/%{name}-%{version}-root
+Obsoletes:     gnome-imglib
+BuildArchitectures:    noarch
 
-Obsoletes: gnome-imglib
-
-Docdir: %{prefix}/doc
-BuildArchitectures: noarch
+%define                _prefix /usr/X11R6
 
 %description
 If you use a desktop environment like GNOME you can use these images
 to spruce up your background.
 
 %prep
-%setup -c desktop-backgrounds-%{ver} -T -D
+%setup -c %{name}-%{version} -T -D
 
-cp %{SOURCE3} $RPM_BUILD_DIR/desktop-backgrounds-%{ver}
-cp %{SOURCE4} $RPM_BUILD_DIR/desktop-backgrounds-%{ver}
-cp %{SOURCE5} $RPM_BUILD_DIR/desktop-backgrounds-%{ver}
+cp %{SOURCE3} $RPM_BUILD_DIR/%{name}-%{version}
+cp %{SOURCE4} $RPM_BUILD_DIR/%{name}-%{version}
+cp %{SOURCE5} $RPM_BUILD_DIR/%{name}-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/pixmaps/backgrounds
-cd $RPM_BUILD_ROOT%{prefix}/share/pixmaps/backgrounds
+install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds
+cd $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds
 tar xzf %{SOURCE0}
 tar xzf %{SOURCE1}
 tar xzf %{SOURCE2}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc {README.space,README.Propaganda,PHOTO_FAQ.ps}.gz
+%{_datadir}/pixmaps/backgrounds/space
+%{_datadir}/pixmaps/backgrounds/tiles
+%{_datadir}/pixmaps/backgrounds/Propaganda