tdawson pushed to rpms/desktop-backgrounds (epel9-next). "use actual uri"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:40 UTC
From 8e4872623e7ade16c02990e77972bb99a1d1cb65 Mon Sep 17 00:00:00 2001
From: Tom "spot" Callaway <tcallawa(a)redhat.com>
Date: Mar 22 2011 21:12:35 +0000
Subject: use actual uri
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index ecc44e2..fe98c8b 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
Name: desktop-backgrounds
Version: 15.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -140,7 +140,7 @@ ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
/bin/echo '[org.gnome.desktop.background]' > \
$RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
-/bin/echo "picture-uri='%{_datadir}/backgrounds/%{fedora_release_name}/default/%{fedora_release_name}.xml'" >> \
+/bin/echo "picture-uri='file://%{_datadir}/backgrounds/%{fedora_release_name}/default/%{fedora_release_name}.xml'" >> \
$RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
# for KDE, this is handled in kde-settings
# for XFCE
@@ -210,6 +210,9 @@ fi
%{_datadir}/backgrounds/default.png
%changelog
+* Tue Mar 22 2011 Tom Callaway <spot(a)fedoraproject.org> - 15.0.0-7
+- picture-uri needs to be an actual uri
+
* Tue Mar 22 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-6
- Update for upcoming changes in gnome-desktop-2.91.92
* picture-uri is used instead of picture-filename to select background
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/8e4872623e7ade16...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "use actual uri"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:40 UTC
From c6bb108f15cf80747d8fd7b83e348c0ae2c57557 Mon Sep 17 00:00:00 2001
From: Tom "spot" Callaway <tcallawa(a)redhat.com>
Date: Mar 22 2011 21:18:51 +0000
Subject: use actual uri
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index ecc44e2..fe98c8b 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
Name: desktop-backgrounds
Version: 15.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -140,7 +140,7 @@ ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
/bin/echo '[org.gnome.desktop.background]' > \
$RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
-/bin/echo "picture-uri='%{_datadir}/backgrounds/%{fedora_release_name}/default/%{fedora_release_name}.xml'" >> \
+/bin/echo "picture-uri='file://%{_datadir}/backgrounds/%{fedora_release_name}/default/%{fedora_release_name}.xml'" >> \
$RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
# for KDE, this is handled in kde-settings
# for XFCE
@@ -210,6 +210,9 @@ fi
%{_datadir}/backgrounds/default.png
%changelog
+* Tue Mar 22 2011 Tom Callaway <spot(a)fedoraproject.org> - 15.0.0-7
+- picture-uri needs to be an actual uri
+
* Tue Mar 22 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-6
- Update for upcoming changes in gnome-desktop-2.91.92
* picture-uri is used instead of picture-filename to select background
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/c6bb108f15cf8074...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "set
default wallpaper for gnome (rhbz #683179). (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:40 UTC
From 85b927f5ae7b8f9df152a80e813aeb218d2f679b Mon Sep 17 00:00:00 2001
From: Martin Sourada <mso(a)fedoraproject.org>
Date: Mar 21 2011 23:57:28 +0000
Subject: set default wallpaper for gnome (rhbz #683179).
Supposedly the fedora-gnome wallpaper will be slightly different than
the other DEs one, but its not ready yet so using the current version
of fedora 15 beta wallpaper.
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 42f409a..ef93a1f 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
Name: desktop-backgrounds
Version: 15.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -43,8 +43,7 @@ Provides: system-backgrounds-gnome = %{version}-%{release}
License: CC-BY-SA
%description gnome
-The desktop-backgrounds-gnome package contains file-names used by GNOME desktop
-environment to set up the default background.
+The desktop-backgrounds-gnome package sets default background in gnome.
%package xfce
Summary: The default Fedora wallpaper from XFCE desktop
@@ -135,12 +134,11 @@ ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
# Defalts for various desktops:
# for GNOME
-install -m 644 -p %{SOURCE7} \
- $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
-sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
- $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
-/bin/ln -s %{fedora_release_name}/default/%{fedora_release_name}.xml \
- $RPM_BUILD_ROOT%{_datadir}/backgrounds/default.xml
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
+/bin/echo '[org.gnome.desktop.background]' > \
+ $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
+/bin/echo "picture-filename='%{_datadir}/backgrounds/%{fedora_release_name}/default/%{fedora_release_name}.xml'" >> \
+ $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
# for KDE, this is handled in kde-settings
# for XFCE
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops
@@ -162,6 +160,15 @@ ln -s ./%{fedora_release_name}/default/standard/%{fedora_release_name}.png \
%clean
rm -rf $RPM_BUILD_ROOT
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ]; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+
%files basic
%defattr(-, root, root)
%dir %{_datadir}/backgrounds
@@ -188,8 +195,7 @@ rm -rf $RPM_BUILD_ROOT
%files gnome
%defattr(-, root, root)
-%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
-%{_datadir}/backgrounds/default.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.desktop.background.fedora.gschema.override
%files xfce
%defattr(-, root, root)
@@ -201,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/backgrounds/default.png
%changelog
+* Tue Mar 22 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-5
+- Set default wallpaper for gnome
+
* Mon Mar 07 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 15.0.0-4
- Drop unused -kde subpackage, we set the default through kde-settings & pull it
in through system-plasma-desktoptheme, which is Provided by lovelock-kde-theme
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/85b927f5ae7b8f9d...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "- The
file-names should not contain the word fedora for the system-backgrounds*
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:39 UTC
From adf91cb5926dd4f35925a40e50b5e7f8c588f339 Mon Sep 17 00:00:00 2001
From: Martin Sourada <mso(a)fedoraproject.org>
Date: Feb 07 2011 21:33:56 +0000
Subject: - The file-names should not contain the word fedora for the system-backgrounds*
virtual provides to be more effective
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 7c477ee..b670db7 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
Name: desktop-backgrounds
Version: 15.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -149,19 +149,19 @@ ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
# Defalts for various desktops:
# for GNOME
install -m 644 -p %{SOURCE7} \
- $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+ $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
- $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+ $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
/bin/ln -s %{fedora_release_name}/default/%{fedora_release_name}.xml \
$RPM_BUILD_ROOT%{_datadir}/backgrounds/default.xml
# for KDE
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora
+mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default
install -m 644 -p %{SOURCE8} \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/fedora-metadata.desktop
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/fedora-metadata.desktop
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
/bin/ln -s ../%{Fedora_Release_Name}/contents \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/contents
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/contents
# for XFCE
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops
/bin/ln -s %{fedora_release_name}.png \
@@ -208,12 +208,12 @@ rm -rf $RPM_BUILD_ROOT
%files gnome
%defattr(-, root, root)
-%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
%{_datadir}/backgrounds/default.xml
%files kde
%defattr(-, root, root)
-%{_kde4_datadir}/wallpapers/Fedora
+%{_kde4_datadir}/wallpapers/Default
%files xfce
%defattr(-, root, root)
@@ -222,9 +222,13 @@ rm -rf $RPM_BUILD_ROOT
%files compat
%defattr(-, root, root)
%{_datadir}/backgrounds/images/default*
-%{_datadir}/backgrounds/default*
+%{_datadir}/backgrounds/default.png
%changelog
+* Mon Feb 07 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-2
+- The file-names should not contain the word fedora for the system-backgrounds*
+ virtual provides to be more effective
+
* Mon Feb 07 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-1
- Provide file-names for default wallpapers
* new subpackages -gnome, -kde, xfce for the various DEs
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/adf91cb5926dd4f3...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "* Mon Mar
07 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 15.0.0-4 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:40 UTC
From 23d2736816d09bd851ccb10d71afe2d2f32b6a0c Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin(a)tigcc.ticalc.org>
Date: Mar 07 2011 17:37:50 +0000
Subject: * Mon Mar 07 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 15.0.0-4
- Drop unused -kde subpackage, we set the default through kde-settings & pull it
in through system-plasma-desktoptheme, which is Provided by lovelock-kde-theme
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 7703fe5..42f409a 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
Name: desktop-backgrounds
Version: 15.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -19,8 +19,6 @@ Source7: desktop-backgrounds-fedora.xml
Source8: fedora-metadata.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-# for %%_kde4_* macros macros
-BuildRequires: kde-filesystem
%description
The desktop-backgrounds package contains artwork intended to be used as
@@ -48,17 +46,6 @@ License: CC-BY-SA
The desktop-backgrounds-gnome package contains file-names used by GNOME desktop
environment to set up the default background.
-%package kde
-Summary: The default Fedora wallpaper from KDE desktop
-Group: User Interface/Desktops
-Requires: %{fedora_release_name}-backgrounds-kde
-Provides: system-backgrounds-kde = %{version}-%{release}
-License: CC-BY-SA
-
-%description kde
-The desktop-backgrounds-kde package contains file-names used by KDE desktop
-environment to set up the default wallpaper.
-
%package xfce
Summary: The default Fedora wallpaper from XFCE desktop
Group: User Interface/Desktops
@@ -154,14 +141,7 @@ sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
$RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
/bin/ln -s %{fedora_release_name}/default/%{fedora_release_name}.xml \
$RPM_BUILD_ROOT%{_datadir}/backgrounds/default.xml
-# for KDE
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default
-install -m 644 -p %{SOURCE8} \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
-sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
-/bin/ln -s ../%{Fedora_Release_Name}/contents \
- $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/contents
+# for KDE, this is handled in kde-settings
# for XFCE
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops
/bin/ln -s %{fedora_release_name}.png \
@@ -211,10 +191,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
%{_datadir}/backgrounds/default.xml
-%files kde
-%defattr(-, root, root)
-%{_kde4_datadir}/wallpapers/Default
-
%files xfce
%defattr(-, root, root)
%{_datadir}/xfce4/backdrops/default.png
@@ -225,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/backgrounds/default.png
%changelog
+* Mon Mar 07 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 15.0.0-4
+- Drop unused -kde subpackage, we set the default through kde-settings & pull it
+ in through system-plasma-desktoptheme, which is Provided by lovelock-kde-theme
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 15.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/23d2736816d09bd8...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "-
wallpapers redone so there is no more banding (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:38 UTC
From 2278c369f9e9f33b37030bfaa4c34b079da65332 Mon Sep 17 00:00:00 2001
From: MáirÃn Duffy <duffy(a)fedoraproject.org>
Date: Sep 26 2007 15:08:35 +0000
Subject: - wallpapers redone so there is no more banding
- wallpapers renamed
- infinity animated file bugs fixed (hopefully)
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 121d068..27990aa 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -105,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/backgrounds/images/flowers_and_leaves.jpg
%{_datadir}/backgrounds/images/earth_from_space.jpg
%{_datadir}/backgrounds/images/*.png
+%{_datadir}/backgrounds/images/*.jpg
%{_datadir}/backgrounds/infinity/*.png
%{_datadir}/backgrounds/infinity/infinity.xml
%dir %{_datadir}/gnome-background-properties
diff --git a/sources b/sources
index a659f8a..dd1a2b3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
9a41ff73a67967715010ed6703898aad Propaganda-1.0.0.tar.gz
f19c55f6c248760c00cd840e2e372ce2 redhat-backgrounds-14.tar.bz2
-84a003eb339a7cb0e7d16fc106982395 desktop-backgrounds-infinity-0.0.1.tar.gz
+84a003eb339a7cb0e7d16fc106982395 desktop-backgrounds-infinity-0.0.2.tar.gz
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/2278c369f9e9f33b...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "- Fix
compat links after solar-backgrounds restructuring (bug 469789)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:39 UTC
From 5bf882dd7588798b00b52a89a1780d8c4b9ad26a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode(a)fedoraproject.org>
Date: Nov 04 2008 20:50:04 +0000
Subject: - Fix compat links after solar-backgrounds restructuring (bug 469789)
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 62542c0..b44dfad 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -4,7 +4,7 @@
Summary: Desktop backgrounds
Name: desktop-backgrounds
Version: 9.0.0
-Release: 4
+Release: 5
License: LGPLv2
Group: Applications/Multimedia
Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
@@ -108,12 +108,11 @@ ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
# Compatibility cruft
(cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
-ln -s ../solar/solar-normal-0-morn.png default.png
-ln -s ../solar/solar-normal-0-morn.png default.jpg
-ln -s ../solar/solar-wide-0-morn.png default-wide.png
-ln -s ../solar/solar-wide-0-morn.png default-5_4.png
+ln -s ../solar/standard/1600x1200/solar-0-morn.png default.png
+ln -s ../solar/standard/1600x1200/solar-0-morn.png default.jpg
+ln -s ../solar/wide/1680x1050/solar-0-morn.png default-5_4.png
cd ..
-ln -s solar/solar-normal-0-morn.png default.png
+ln -s solar/standard/1600x1200/solar-0-morn.png default.png
)
%clean
@@ -149,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/backgrounds/default*
%changelog
+* Tue Nov 4 2008 Ray Strode <rstrode(a)redhat.com> 9.0.0-5
+- Fix compat links after solar-backgrounds restructuring
+ (bug 469789)
+
* Mon Oct 27 2008 Ray Strode <rstrode(a)redhat.com> 9.0.0-4
- Make compat subpackage depend on solar backgrounds
(bug 468749)
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/5bf882dd7588798b...
1Â year
tdawson pushed to rpms/desktop-backgrounds (epel9-next). "- Provide
file-names for default wallpapers (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-05-01 15:58:39 UTC
From 0b64f2946bcbc66c2f99751338bc94b1917509c7 Mon Sep 17 00:00:00 2001
From: Martin Sourada <mso(a)fedoraproject.org>
Date: Feb 07 2011 12:28:25 +0000
Subject: - Provide file-names for default wallpapers
* new subpackages -gnome, -kde, xfce for the various DEs
* -compat subpackage is really for setting the default wallpaper for the
other desktops like LXDE, adjust the description and summary
* use correct suffix in file-names in -compat subpackage
- Sync version with Fedora release
---
diff --git a/desktop-backgrounds-fedora.xml b/desktop-backgrounds-fedora.xml
new file mode 100644
index 0000000..ac70303
--- /dev/null
+++ b/desktop-backgrounds-fedora.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+ <wallpaper deleted="false">
+ <name>Fedora (@RELEASE_NAME@)</name>
+ <filename>/usr/share/backgrounds/default.xml</filename>
+ <options>stretched</options>
+ </wallpaper>
+</wallpapers>
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 7804b2c..7c477ee 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -1,9 +1,11 @@
%global rh_backgrounds_version 15
%global waves_version 0.1.2
+%global fedora_release_name lovelock
+%global Fedora_Release_Name Lovelock
Name: desktop-backgrounds
-Version: 9.0.0
-Release: 15%{?dist}
+Version: 15.0.0
+Release: 1%{?dist}
Summary: Desktop backgrounds
Group: User Interface/Desktops
@@ -13,8 +15,12 @@ Source2: Propaganda-1.0.0.tar.gz
Source3: README.Propaganda
Source5: waves-%{waves_version}.tar.bz2
Source6: FedoraWaves-metadata.desktop
+Source7: desktop-backgrounds-fedora.xml
+Source8: fedora-metadata.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
+# for %%_kde4_* macros macros
+BuildRequires: kde-filesystem
%description
The desktop-backgrounds package contains artwork intended to be used as
@@ -31,16 +37,50 @@ Obsoletes: desktop-backgrounds < %{version}-%{release}
The desktop-backgrounds-basic package contains artwork intended to be used as
desktop background image.
+%package gnome
+Summary: The default Fedora wallpaper from GNOME desktop
+Group: User Interface/Desktops
+Requires: %{fedora_release_name}-backgrounds-gnome
+Provides: system-backgrounds-gnome = %{version}-%{release}
+License: CC-BY-SA
+
+%description gnome
+The desktop-backgrounds-gnome package contains file-names used by GNOME desktop
+environment to set up the default background.
+
+%package kde
+Summary: The default Fedora wallpaper from KDE desktop
+Group: User Interface/Desktops
+Requires: %{fedora_release_name}-backgrounds-kde
+Provides: system-backgrounds-kde = %{version}-%{release}
+License: CC-BY-SA
+
+%description kde
+The desktop-backgrounds-kde package contains file-names used by KDE desktop
+environment to set up the default wallpaper.
+
+%package xfce
+Summary: The default Fedora wallpaper from XFCE desktop
+Group: User Interface/Desktops
+Requires: %{fedora_release_name}-backgrounds-xfce
+Provides: system-backgrounds-xfce = %{version}-%{release}
+License: CC-BY-SA
+
+%description xfce
+The desktop-backgrounds-xfce package contains file-names used by XFCE desktop
+environment to set up the default backdrop.
%package compat
-Summary: Desktop backgrounds from previous Fedora releases
+Summary: The default Fedora wallpaper for less common DEs
Group: User Interface/Desktops
-Requires: laughlin-backgrounds-single
+Requires: %{fedora_release_name}-backgrounds-single
+Provides: system-backgrounds-compat = %{version}-%{release}
+License: CC-BY-SA
%description compat
-The desktop-backgrounds-compat package contains filenames used
-in previous releases of Fedora to provide backward compatiblity
-with existing setups.
+The desktop-backgrounds-compat package contains file-names used
+by less common Desktop Environments such as LXDE to set up the
+default wallpaper.
%package waves
Summary: Desktop backgrounds for the Waves theme
@@ -106,12 +146,37 @@ ln -s ../../../../backgrounds/waves/waves-normal-3-night.png 1600x1200.png
ln -s ../../../../backgrounds/waves/waves-wide-3-night.png 1920x1200.png
)
-# Compatibility cruft
+# Defalts for various desktops:
+# for GNOME
+install -m 644 -p %{SOURCE7} \
+ $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
+ $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+/bin/ln -s %{fedora_release_name}/default/%{fedora_release_name}.xml \
+ $RPM_BUILD_ROOT%{_datadir}/backgrounds/default.xml
+# for KDE
+mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora
+install -m 644 -p %{SOURCE8} \
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/fedora-metadata.desktop
+sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/fedora-metadata.desktop
+/bin/ln -s ../%{Fedora_Release_Name}/contents \
+ $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Fedora/contents
+# for XFCE
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops
+/bin/ln -s %{fedora_release_name}.png \
+ $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops/default.png
+# and for the rest (e.g. LXDE)
(cd $RPM_BUILD_ROOT%{_datadir}/backgrounds/images;
-ln -s ../laughlin/default/standard/laughlin.png default.png
-ln -s ../laughlin/default/wide/laughlin.png default-5_4.png
+ln -s ../%{fedora_release_name}/default/standard/%{fedora_release_name}.png \
+ default.png
+ln -s ../%{fedora_release_name}/default/normalish/%{fedora_release_name}.png \
+ default-5_4.png
+ln -s ../%{fedora_release_name}/default/wide/%{fedora_release_name}.png \
+ default-16_10.png
cd ..
-ln -s ./laughlin/default/standard/laughlin.png default.png
+ln -s ./%{fedora_release_name}/default/standard/%{fedora_release_name}.png \
+ default.png
)
%clean
@@ -141,12 +206,33 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gnome-background-properties/desktop-backgrounds-waves.xml
%{_datadir}/wallpapers/Fedora_Waves
+%files gnome
+%defattr(-, root, root)
+%{_datadir}/gnome-background-properties/desktop-backgrounds-fedora.xml
+%{_datadir}/backgrounds/default.xml
+
+%files kde
+%defattr(-, root, root)
+%{_kde4_datadir}/wallpapers/Fedora
+
+%files xfce
+%defattr(-, root, root)
+%{_datadir}/xfce4/backdrops/default.png
+
%files compat
%defattr(-, root, root)
%{_datadir}/backgrounds/images/default*
%{_datadir}/backgrounds/default*
%changelog
+* Mon Feb 07 2011 Martin Sourada <mso(a)fedoraproject.org> - 15.0.0-1
+- Provide file-names for default wallpapers
+ * new subpackages -gnome, -kde, xfce for the various DEs
+ * -compat subpackage is really for setting the default wallpaper for the
+ other desktops like LXDE, adjust the description and summary
+ * use correct suffix in file-names in -compat subpackage
+- Sync version with Fedora release
+
* Thu Aug 12 2010 Martin Sourada <mso(a)fedoraproject.org> - 9.0.0-15
- Rebuild, add dist tag.
- Properly versioned provides/obsoletes for the -basic subpackage
diff --git a/fedora-metadata.desktop b/fedora-metadata.desktop
new file mode 100644
index 0000000..c2c0904
--- /dev/null
+++ b/fedora-metadata.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Fedora
+X-KDE-PluginInfo-Name=Fedora (@RELEASE_NAME@)
+X-KDE-PluginInfo-Author=Fedora Project
+X-KDE-PluginInfo-Email=fedora-kde(a)lists.fedoraproject.org
+X-KDE-PluginInfo-License=CC-BY-SA
+
https://src.fedoraproject.org/rpms/desktop-backgrounds/c/0b64f2946bcbc66c...
1Â year