[rss-glx: 3/3] fix silent skyrocket desktop filename (#617531)
Nils Philippsen
nphilipp at fedoraproject.org
Mon Oct 11 13:24:52 UTC 2010
commit bbe682839b5db7c1c7c469b4e08972a22f460f11
Author: Nils Philippsen <nils at redhat.com>
Date: Mon Oct 11 15:24:29 2010 +0200
fix silent skyrocket desktop filename (#617531)
.gitignore | 1 +
rss-glx-0.9.1.p-autoreconf.patch | 177 --------------------------------------
rss-glx-0.9.1.p-linker.patch | 20 ----
rss-glx.spec | 65 +++++++-------
sources | 1 +
5 files changed, 36 insertions(+), 228 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41d8299..34d7f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rss-glx_0.8.1.p.tar.bz2
rss-glx_0.8.2.p.tar.bz2
rss-glx_0.9.0.p.tar.bz2
rss-glx_0.9.1.p.tar.bz2
+/rss-glx-0.9.1.p-6-autoreconf.patch.bz2
diff --git a/rss-glx-0.9.1.p-linker.patch b/rss-glx-0.9.1.p-linker.patch
index d195d98..ac03384 100644
--- a/rss-glx-0.9.1.p-linker.patch
+++ b/rss-glx-0.9.1.p-linker.patch
@@ -9,23 +9,3 @@ diff -ru rss-glx_0.9.1.p.orig/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
spirographx_SOURCES = driver.c spirographx.c
-diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
---- rss-glx_0.9.1.p.orig/src/Makefile.in 2010-04-11 14:03:33.000000000 +0100
-+++ rss-glx_0.9.1.p/src/Makefile.in 2010-04-11 18:29:52.000000000 +0100
-@@ -446,6 +446,7 @@
- plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
- pixelcity_SOURCES = driver.c
- pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
-+pixelcity_LINK = $(CXXLINK)
- skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
- solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
- spirographx_SOURCES = driver.c spirographx.c
-@@ -599,7 +600,7 @@
- $(CXXLINK) $(lorenz_OBJECTS) $(lorenz_LDADD) $(LIBS)
- pixelcity$(EXEEXT): $(pixelcity_OBJECTS) $(pixelcity_DEPENDENCIES)
- @rm -f pixelcity$(EXEEXT)
-- $(LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
-+ $(pixelcity_LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
- plasma$(EXEEXT): $(plasma_OBJECTS) $(plasma_DEPENDENCIES)
- @rm -f plasma$(EXEEXT)
- $(CXXLINK) $(plasma_OBJECTS) $(plasma_LDADD) $(LIBS)
diff --git a/rss-glx.spec b/rss-glx.spec
index 4461257..6a78127 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -44,7 +44,7 @@
Summary: Really Slick Screensavers
Name: rss-glx
Version: 0.9.1%{patchext}
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
@@ -58,8 +58,8 @@ Source2: rss-glx-rm-matrixview.sh
Source3: rss-glx-0.9.1-0.9.1.p.diff
# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
Patch0: rss-glx-0.9.0.p-optflags.patch
-Patch1: rss-glx-0.9.1.p-autoreconf.patch
-Patch2: rss-glx-0.9.1.p-linker.patch
+Patch1: rss-glx-0.9.1.p-linker.patch
+Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -172,8 +172,8 @@ Build settings:
EOF
%setup -q -n rss-glx_%{version}
%patch0 -p1 -b .optflags
-%patch1 -p1 -b .autoreconf
-%patch2 -p1 -b .linker
+%patch1 -p1 -b .linker
+%patch10 -p1 -b .autoreconf
%build
%configure \
@@ -188,10 +188,10 @@ generate_fix_desktop_files_links () {
while read line; do
%if %{with gss}
# generate GNOME screensaver desktop files
- eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"rss-glx-" $2 "\"; desc=\"" $3 "\""}')
+ eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; desktopfilename=\"rss-glx-" $2 ".desktop\"; cmd=\"rss-glx-" $3 "\"; desc=\"" $4 "\""}')
trycmd="${cmd%%%% *}"
origtrycmd="${trycmd#rss-glx-}"
- cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
+ cat << EOF > %{buildroot}%{_gssconfigdir}/${desktopfilename}
[Desktop Entry]
Name=${name}
@@ -249,32 +249,32 @@ mkdir -p %{buildroot}%{xssbindir}
mkdir -p %{buildroot}%{xssexthacksconfdir}
%endif
cat << EOF | generate_fix_desktop_files_links
-BioF§biof§This is an attempt to recreate some of the work of William Latham.
-Busy Spheres§busyspheres§Spheres made of dancing particles.
-Colorfire§colorfire§Burning colors.
-Cyclone§cyclone§A cyclone made of particles.
-Drempels§drempels§A hallucinatory desktop enhancer.
-Euphoria§euphoria§Psychedelic shapes.
-Feedback§feedback§Stirring colors with a jiggling warp.
-Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
-Flocks§flocks§Floating wisps.
-Flux§flux§Flux fields and stuff.
-Helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
-Hufo's Smoke§hufo_smoke§Particle smoke effect.
-Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
-Hyperspace§hyperspace§Flying through hyper space.
-Lattice§lattice§Fly through an endless world of linked rings.
-Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
+BioF§biof§biof§This is an attempt to recreate some of the work of William Latham.
+Busy Spheres§busyspheres§busyspheres§Spheres made of dancing particles.
+Colorfire§colorfire§colorfire§Burning colors.
+Cyclone§cyclone§cyclone§A cyclone made of particles.
+Drempels§drempels§drempels§A hallucinatory desktop enhancer.
+Euphoria§euphoria§euphoria§Psychedelic shapes.
+Feedback§feedback§feedback§Stirring colors with a jiggling warp.
+Fieldlines§fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
+Flocks§flocks§flocks§Floating wisps.
+Flux§flux§flux§Flux fields and stuff.
+Helios§helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke§hufo_smoke§hufo_smoke§Particle smoke effect.
+Hufo's Tunnel§hufo_tunnel§hufo_tunnel§Inside a tunnel.
+Hyperspace§hyperspace§hyperspace§Flying through hyper space.
+Lattice§lattice§lattice§Fly through an endless world of linked rings.
+Lorenz§lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
%if %{with matrixview}
-MatrixView§matrixview§The Matrix.
+MatrixView§matrixview§matrixview§The Matrix.
%endif
-Pixel City§pixelcity§Procedural city fly through.
-Plasma§plasma§Oozing plasma.
-Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
-Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
-Solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
-SpirographX§spirographx§Spirograph-like screensaver.
-Sundancer2§sundancer2§Rotating stack of quads.
+Pixel City§pixelcity§pixelcity§Procedural city fly through.
+Plasma§plasma§plasma§Oozing plasma.
+Skyrocket (silent)§skyrocket-silent§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
+Skyrocket§skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
+Solarwinds§solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
+SpirographX§spirographx§spirographx§Spirograph-like screensaver.
+Sundancer2§sundancer2§sundancer2§Rotating stack of quads.
EOF
%clean
@@ -322,6 +322,9 @@ fi
%{kdessconfigdir}/*.desktop
%changelog
+* Mon Oct 11 2010 Nils Philippsen <nils at redhat.com> 0.9.1.p-6
+- fix silent skyrocket desktop filename (#617531)
+
* Wed Sep 29 2010 jkeating - 0.9.1.p-5
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 0477243..f353def 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
bc420d230634fe8d3bbc79dc6a3c6678 rss-glx_0.9.1.p.tar.bz2
+86fdbdf7e06b184c70c1280c5a030021 rss-glx-0.9.1.p-6-autoreconf.patch.bz2
More information about the scm-commits
mailing list