[earth-and-moon-backgrounds] Rebuild

MERCIER Jonathan bioinfornatics at fedoraproject.org
Fri May 10 17:46:40 UTC 2013


commit 5ca714ca63a6fa0b5054dcf054fc361ed7aac29e
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Fri May 10 19:46:38 2013 +0200

    Rebuild

 earth-and-moon-backgrounds.spec |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/earth-and-moon-backgrounds.spec b/earth-and-moon-backgrounds.spec
index 5e91a37..d975031 100644
--- a/earth-and-moon-backgrounds.spec
+++ b/earth-and-moon-backgrounds.spec
@@ -8,7 +8,6 @@ License:        CC-BY-SA
 URL:            http://bioinformatiques.free.fr/
 
 Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       %{name}-common = %{version}-%{release}
@@ -75,42 +74,38 @@ Terre. Ce fond écrans sont compatibles dans plusieurs résolution: 2560x1024,
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # prepare the dir structure
 for RESOLUTION in 800x600 1280x1024 1600x1200 1680x1050 1900x1200 2560x1024 3200x1200 3840x1200;
-do mkdir -p $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/$RESOLUTION;
+do mkdir -p %{buildroot}/%{_datadir}/backgrounds/earth-and-moon/$RESOLUTION;
 done;
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+mkdir -p %{buildroot}/%{_datadir}/gnome-background-properties
 
 # copy the earth-and-moon images
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon/{800x600,1280x1024,1600x1200,1680x1050,1900x1200,2560x1024,2960x1050,3200x1200,3840x1200} \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon/
+        %{buildroot}/%{_datadir}/backgrounds/earth-and-moon/
 
 # copy slideshow xml files
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
+        %{buildroot}/%{_datadir}/backgrounds/earth-and-moon
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/earth-and-moon-hd.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/backgrounds/earth-and-moon
+        %{buildroot}/%{_datadir}/backgrounds/earth-and-moon
 
 # copy metadata xmls file
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+        %{buildroot}/%{_datadir}/gnome-background-properties
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/desktop-backgrounds-earth-and-moon-hd.xml \
-        $RPM_BUILD_ROOT/%{_datadir}/gnome-background-properties
+        %{buildroot}/%{_datadir}/gnome-background-properties
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING
 %{_datadir}/gnome-background-properties/desktop-backgrounds-earth-and-moon.xml
 %{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
 
 %files common
-%defattr(-,root,root,-)
 %doc COPYING
 %dir %{_datadir}/backgrounds/earth-and-moon
 %dir %{_datadir}/backgrounds/earth-and-moon/800x600
@@ -133,7 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/earth-and-moon/3840x1200/01.jpeg
 
 %files dual
-%defattr(-,root,root,-)
 %doc COPYING
 %{_datadir}/backgrounds/earth-and-moon/2560x1024
 %{_datadir}/backgrounds/earth-and-moon/2960x1050
@@ -143,7 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/earth-and-moon/earth-and-moon-hd.xml
 
 %files single
-%defattr(-,root,root,-)
 %doc COPYING
 %{_datadir}/backgrounds/earth-and-moon/800x600
 %{_datadir}/backgrounds/earth-and-moon/1280x1024
@@ -154,7 +147,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/earth-and-moon/earth-and-moon.xml
 
 %files kdm
-%defattr(-,root,root,-)
 %doc COPYING
 %dir %{_datadir}/backgrounds/earth-and-moon
 %dir %{_datadir}/backgrounds/earth-and-moon/1680x1050


More information about the scm-commits mailing list