From 5f15eea28172e2e78844ebe29c8ded29f21fe49c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 03:48:29 +0000 Subject: [PATCH 1/9] Initialize branch F-8 for aasaver --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From b7a79dcc904f0b92abdbbb7d8ca79a724756a3ea Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sun, 6 Jan 2008 22:53:22 +0000 Subject: [PATCH 2/9] *** empty log message *** --- aasaver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/aasaver.spec b/aasaver.spec index de29b38..22153d3 100644 --- a/aasaver.spec +++ b/aasaver.spec @@ -1,6 +1,6 @@ Name: aasaver Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A screensaver for KDE which presents an ASCII aquarium Group: Amusements/Graphics License: GPLv2+ @@ -9,7 +9,7 @@ URL: http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?conten # http://www.kde-apps.org/content/download.php?content=29207 Source0: 29207-%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel +BuildRequires: kdelibs3-devel BuildRequires: scons Requires: xscreensaver-base @@ -48,5 +48,8 @@ rm -rf %{buildroot} %changelog +* Sun Jan 06 2008 Ian Chapman 0.3.2-2 +- Use kdelibs3-devel now instead of kdelibs-devel + * Sun Sep 30 2007 Ian Chapman 0.3.2-1 -- Initial release \ No newline at end of file +- Initial release From eef75654fb9aa254d03acf28f6fdc141c5881f5b Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sun, 6 Jan 2008 22:54:34 +0000 Subject: [PATCH 3/9] *** empty log message *** --- aasaver.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/aasaver.spec b/aasaver.spec index de29b38..22153d3 100644 --- a/aasaver.spec +++ b/aasaver.spec @@ -1,6 +1,6 @@ Name: aasaver Version: 0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A screensaver for KDE which presents an ASCII aquarium Group: Amusements/Graphics License: GPLv2+ @@ -9,7 +9,7 @@ URL: http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?conten # http://www.kde-apps.org/content/download.php?content=29207 Source0: 29207-%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel +BuildRequires: kdelibs3-devel BuildRequires: scons Requires: xscreensaver-base @@ -48,5 +48,8 @@ rm -rf %{buildroot} %changelog +* Sun Jan 06 2008 Ian Chapman 0.3.2-2 +- Use kdelibs3-devel now instead of kdelibs-devel + * Sun Sep 30 2007 Ian Chapman 0.3.2-1 -- Initial release \ No newline at end of file +- Initial release From 091d7f925c181fc796e6fba2cf19aa63f9f912bb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 16:37:02 +0000 Subject: [PATCH 4/9] - Autorebuild for GCC 4.3 --- aasaver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aasaver.spec b/aasaver.spec index 22153d3..50dcd0e 100644 --- a/aasaver.spec +++ b/aasaver.spec @@ -1,6 +1,6 @@ Name: aasaver Version: 0.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A screensaver for KDE which presents an ASCII aquarium Group: Amusements/Graphics License: GPLv2+ @@ -48,6 +48,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.3.2-3 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.3.2-2 - Use kdelibs3-devel now instead of kdelibs-devel From 2a29a988a560e998d48e870e1cc82eea018034d1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 30 Jan 2009 13:28:24 +0000 Subject: [PATCH 5/9] Being a KDE3 screensaver, doesn't make sense on F9 and newer --- .cvsignore | 1 - aasaver.spec | 58 ---------------------------------------------------- dead.package | 1 + sources | 1 - 4 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 .cvsignore delete mode 100644 aasaver.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f981f20..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -29207-aasaver-0.3.2.tar.bz2 diff --git a/aasaver.spec b/aasaver.spec deleted file mode 100644 index 50dcd0e..0000000 --- a/aasaver.spec +++ /dev/null @@ -1,58 +0,0 @@ -Name: aasaver -Version: 0.3.2 -Release: 3%{?dist} -Summary: A screensaver for KDE which presents an ASCII aquarium -Group: Amusements/Graphics -License: GPLv2+ -URL: http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?content=29207 -# Actual source URL is: -# http://www.kde-apps.org/content/download.php?content=29207 -Source0: 29207-%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs3-devel -BuildRequires: scons -Requires: xscreensaver-base - -%description -KDE Asciiquarium is a KDE screensaver based on Kirk Baucom's fabulous -asciiquarium program (http://www.robobunny.com/projects/asciiquarium/). It's a -simulation of an animated ocean scene using ASCII art. - - -%prep -%setup -q -sed -i 's|rpath||' SConstruct - - -%build -export CFLAGS="%{optflags}" -# Not a true configure script -./configure -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot}/usr - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{_bindir}/asciiquarium.kss -%{_datadir}/applnk/System/ScreenSavers/asciiquarium.desktop -%config(noreplace) %{_datadir}/config.kcfg/asciiquarium.kcfg - - -%changelog -* Tue Feb 19 2008 Fedora Release Engineering - 0.3.2-3 -- Autorebuild for GCC 4.3 - -* Sun Jan 06 2008 Ian Chapman 0.3.2-2 -- Use kdelibs3-devel now instead of kdelibs-devel - -* Sun Sep 30 2007 Ian Chapman 0.3.2-1 -- Initial release diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c1ffc9b --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Being a KDE3 screensaver, doesn't make sense on F9 and newer diff --git a/sources b/sources deleted file mode 100644 index 63a6ae7..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -dfc6780c196883f25ec01b4663dfaca3 29207-aasaver-0.3.2.tar.bz2 From a7cbce453aa12e476d00a4189a7583ffbe5bab02 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:00 +0000 Subject: [PATCH 6/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1f947c..356a633 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := aasaver SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c0b1cbb3629156cbde1feacbd9392814606e6245 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:06 +0000 Subject: [PATCH 7/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1f947c..356a633 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := aasaver SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From cf1e4f06572548b895f90cf60761a8d1d6b0aec9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:08 +0000 Subject: [PATCH 8/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 356a633..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aasaver -# $Id$ -NAME := aasaver -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From 8532a8d6d787686f11b0a96762323312868c685e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:09 +0000 Subject: [PATCH 9/9] dist-git conversion --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 356a633..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aasaver -# $Id$ -NAME := aasaver -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)