rpms/rss-glx/F-12 rss-glx-0.9.1-0.9.1.p.diff, NONE, 1.1 .cvsignore, 1.5, 1.6 rss-glx.spec, 1.36, 1.37 sources, 1.8, 1.9 rss-glx-0.9.0-0.9.0.p.diff, 1.1, NONE
Nils Philippsen
nphilipp at fedoraproject.org
Mon Jan 18 12:20:03 UTC 2010
Author: nphilipp
Update of /cvs/pkgs/rpms/rss-glx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12330
Modified Files:
.cvsignore rss-glx.spec sources
Added Files:
rss-glx-0.9.1-0.9.1.p.diff
Removed Files:
rss-glx-0.9.0-0.9.0.p.diff
Log Message:
version 0.9.1.p
remove autofoo patch
add BR: quesoglc-devel for new pixelcity hack
bump BR: ImageMagick-devel >= 6.4
rss-glx-0.9.1-0.9.1.p.diff:
ChangeLog | 4 ++++
README.xscreensaver | 1 -
configure.in | 2 +-
src/Makefile.am | 10 ++--------
utils/rss-glx_install.pl | 1 -
5 files changed, 7 insertions(+), 11 deletions(-)
--- NEW FILE rss-glx-0.9.1-0.9.1.p.diff ---
diff -urBNw rss-glx_0.9.1/ChangeLog rss-glx_0.9.1.p/ChangeLog
--- rss-glx_0.9.1/ChangeLog 2010-01-05 03:57:27.000000000 +0100
+++ rss-glx_0.9.1.p/ChangeLog 2010-01-18 12:38:23.000000000 +0100
@@ -1,3 +1,7 @@
+****************************** Version 0.9.1.p ********************************
+
+ Removed matrixview
+
******************************* Version 0.9.1 *********************************
Added port of Pixel City, originally by Shamus Young,
diff -urBNw rss-glx_0.9.1/configure.in rss-glx_0.9.1.p/configure.in
--- rss-glx_0.9.1/configure.in 2010-01-05 03:59:13.000000000 +0100
+++ rss-glx_0.9.1.p/configure.in 2010-01-18 12:38:41.000000000 +0100
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(src/driver.c)
-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
+AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
diff -urBNw rss-glx_0.9.1/README.xscreensaver rss-glx_0.9.1.p/README.xscreensaver
--- rss-glx_0.9.1/README.xscreensaver 2010-01-05 03:38:14.000000000 +0100
+++ rss-glx_0.9.1.p/README.xscreensaver 2010-01-18 12:47:02.000000000 +0100
@@ -28,7 +28,6 @@
GL: "BioF" biof --root \n\
GL: "BusySpheres" busyspheres --root \n\
GL: "SpirographX" spirographx --root \n\
- GL: "MatrixView" matrixview --root \n\
GL: "Lorenz" lorenz --root \n\
GL: "Drempels" drempels --root \n\
GL: "Feedback" feedback --root \n\
diff -urBNw rss-glx_0.9.1/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
--- rss-glx_0.9.1/src/Makefile.am 2010-01-04 01:44:04.000000000 +0100
+++ rss-glx_0.9.1.p/src/Makefile.am 2010-01-18 12:47:58.000000000 +0100
@@ -3,7 +3,7 @@
INCLUDES = -I$(top_srcdir)/src
AM_LDFLAGS = @GLEW@
-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview pixelcity plasma skyrocket solarwinds spirographx sundancer2
+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz pixelcity plasma skyrocket solarwinds spirographx sundancer2
biof_SOURCES = driver.c biof.c
busyspheres_SOURCES = driver.c busyspheres.c
@@ -33,9 +33,6 @@
lattice_LDADD = @BZIP2@
lorenz_SOURCES = driver.c lorenz.cpp
lorenz_LDADD = -LrsMath -lrsMath
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
-matrixview_CFLAGS = @Wand_CFLAGS@
-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
pixelcity_SOURCES = driver.c
pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
@@ -75,9 +72,6 @@
lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
- ./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
@@ -115,4 +109,4 @@
skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
endif
-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
diff -urBNw rss-glx_0.9.1/utils/rss-glx_install.pl rss-glx_0.9.1.p/utils/rss-glx_install.pl
--- rss-glx_0.9.1/utils/rss-glx_install.pl 2010-01-05 03:38:40.000000000 +0100
+++ rss-glx_0.9.1.p/utils/rss-glx_install.pl 2010-01-18 12:48:17.000000000 +0100
@@ -26,7 +26,6 @@
$screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\';
$screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\';
$screensavers->{'spirographx'} = ' GL: "SpirographX" spirographx --root \\n\\';
-$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\';
$screensavers->{'lorenz'} = ' GL: "Lorenz" lorenz --root \\n\\';
$screensavers->{'drempels'} = ' GL: "Drempels" drempels --root \\n\\';
$screensavers->{'feedback'} = ' GL: "Feedback" feedback --root \\n\\';
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 17 Aug 2009 15:46:46 -0000 1.5
+++ .cvsignore 18 Jan 2010 12:20:03 -0000 1.6
@@ -1,2 +1 @@
-rss-glx_0.9.0.p.tar.bz2
-rss-glx-0.9.0-autofoo.patch.bz2
+rss-glx_0.9.1.p.tar.bz2
Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-12/rss-glx.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- rss-glx.spec 1 Sep 2009 13:25:48 -0000 1.36
+++ rss-glx.spec 18 Jan 2010 12:20:03 -0000 1.37
@@ -43,8 +43,8 @@
Summary: Really Slick Screensavers
Name: rss-glx
-Version: 0.9.0%{patchext}
-Release: 3%{?dist}
+Version: 0.9.1%{patchext}
+Release: 1%{?dist}
License: GPLv2
Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
@@ -55,16 +55,15 @@ Source0: rss-glx_%{version}.tar.bz2
Source1: README.fedora
# The following two strip matrixview from the package and build a new tarball
Source2: rss-glx-rm-matrixview.sh
-Source3: rss-glx-0.9.0-0.9.0.p.diff
+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
-# don't run autoreconf when building
-Patch1: rss-glx-0.9.0-autofoo.patch.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: glew-devel
-BuildRequires: ImageMagick-devel >= 6.2.5.4
+BuildRequires: quesoglc-devel
+BuildRequires: ImageMagick-devel >= 6.4
%if %{with modular_x}
BuildRequires: libICE-devel
BuildRequires: libSM-devel
@@ -171,7 +170,6 @@ Build settings:
EOF
%setup -q -n rss-glx_%{version}
%patch0 -p1 -b .optflags
-%patch1 -p1 -b .autofoo
%build
%configure \
@@ -266,6 +264,7 @@ Lorenz§lorenz§A visualization of the L
%if %{with 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.
@@ -292,7 +291,7 @@ fi
%files
%defattr(-, root, root)
%doc ChangeLog COPYING INSTALL
-%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
%{_bindir}/*
%{_mandir}/*/*
@@ -319,6 +318,12 @@ fi
%{kdessconfigdir}/*.desktop
%changelog
+* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.1.p-1
+- version 0.9.1.p
+- remove autofoo patch
+- add BR: quesoglc-devel for new pixelcity hack
+- bump BR: ImageMagick-devel >= 6.4
+
* Tue Sep 01 2009 Nils Philippsen <nils at redhat.com> 0.9.0.p-3
- don't ship prefixed rss-glx-rss-glx_install.pl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 17 Aug 2009 15:46:46 -0000 1.8
+++ sources 18 Jan 2010 12:20:03 -0000 1.9
@@ -1,2 +1 @@
-95f9c42e1172b65fa9d8c182500a0944 rss-glx_0.9.0.p.tar.bz2
-aaa6755b6ddc04a6597fac6ed1984339 rss-glx-0.9.0-autofoo.patch.bz2
+bc420d230634fe8d3bbc79dc6a3c6678 rss-glx_0.9.1.p.tar.bz2
--- rss-glx-0.9.0-0.9.0.p.diff DELETED ---
More information about the scm-commits
mailing list