rpms/pipenightdreams/devel pipenightdreams-0.10.0-datadir.patch, NONE, 1.1 pipenightdreams-0.10.0-gcc41.patch, NONE, 1.1 pipenightdreams.desktop, NONE, 1.1 pipenightdreams.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Apr 7 11:12:46 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/pipenightdreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16983/devel
Modified Files:
.cvsignore sources
Added Files:
pipenightdreams-0.10.0-datadir.patch
pipenightdreams-0.10.0-gcc41.patch pipenightdreams.desktop
pipenightdreams.spec
Log Message:
auto-import pipenightdreams-0.10.0-1 on branch devel from pipenightdreams-0.10.0-1.src.rpm
pipenightdreams-0.10.0-datadir.patch:
--- NEW FILE pipenightdreams-0.10.0-datadir.patch ---
--- pipenightdreams-0.10.0/configure.datadir 2006-04-05 19:46:59.000000000 +0200
+++ pipenightdreams-0.10.0/configure 2006-04-05 19:47:18.000000000 +0200
@@ -1613,7 +1613,7 @@
#Thanks to Ingo Ruhnke <grumbel at gmx.de>
- game_datadir="$datadir/games/$PACKAGE"
+ game_datadir="$datadir/$PACKAGE"
game_datadir=`(
test "x$prefix" = xNONE && prefix=${ac_default_prefix}
test "x$exec_prefix" = xNONE && exec_prefix=${prefix}
pipenightdreams-0.10.0-gcc41.patch:
--- NEW FILE pipenightdreams-0.10.0-gcc41.patch ---
diff -ur pipenightdreams-0.10.0.orig/src/eventmanager.cpp pipenightdreams-0.10.0/src/eventmanager.cpp
--- pipenightdreams-0.10.0.orig/src/eventmanager.cpp 2002-01-17 20:56:26.000000000 +0100
+++ pipenightdreams-0.10.0/src/eventmanager.cpp 2006-04-04 21:32:53.000000000 +0200
@@ -40,7 +40,7 @@
lista_streams->remove(lista_streams->indexOf(s));
}
-void EventManager::pumpEvents(bool wait=false){
+void EventManager::pumpEvents(bool wait){
SDL_Event event;
Index * stream;
bool got=false;
diff -ur pipenightdreams-0.10.0.orig/src/graphic.cpp pipenightdreams-0.10.0/src/graphic.cpp
--- pipenightdreams-0.10.0.orig/src/graphic.cpp 2002-01-17 20:56:29.000000000 +0100
+++ pipenightdreams-0.10.0/src/graphic.cpp 2006-04-04 21:32:34.000000000 +0200
@@ -44,11 +44,11 @@
if (pixels) free(pixels);
}
-void Graphic::setAlpha(char value=OPAQUE){
+void Graphic::setAlpha(char value){
SDL_SetAlpha(surface, SDL_SRCALPHA, value);
}
-void Graphic::enableClipping(bool flag=true){
+void Graphic::enableClipping(bool flag){
if (flag){
SDL_Rect rect;
@@ -68,7 +68,7 @@
clip_height=height;
}
-void Graphic::flip(Axis a=HAxis){
+void Graphic::flip(Axis a){
if (surface){
if (SDL_MUSTLOCK(surface))
if (SDL_LockSurface(surface)<0) return;
diff -ur pipenightdreams-0.10.0.orig/src/hash.cpp pipenightdreams-0.10.0/src/hash.cpp
--- pipenightdreams-0.10.0.orig/src/hash.cpp 2002-01-17 20:56:30.000000000 +0100
+++ pipenightdreams-0.10.0/src/hash.cpp 2006-04-04 21:32:00.000000000 +0200
@@ -55,10 +55,10 @@
return(sum % nbuckets);
}
-Hash::Hash(int bs=256){
+Hash::Hash(int bs){
int i;
nbuckets=bs;
- lbuckets=new (List *)[nbuckets];
+ lbuckets=new List *[nbuckets];
for (i=0;i<nbuckets;i++)
lbuckets[i]=new List();
@@ -99,7 +99,7 @@
return NotAdded;
}
-Hash::Result Hash::remove(Str * str, bool del=false){
+Hash::Result Hash::remove(Str * str, bool del){
if (str){
Index * i;
List * list=lbuckets[function(str)];
@@ -135,7 +135,7 @@
return NULL;
}
-void Hash::empty(bool del=true){
+void Hash::empty(bool del){
int i;
List * list;
for (i=0;i<nbuckets;i++){
diff -ur pipenightdreams-0.10.0.orig/src/image.cpp pipenightdreams-0.10.0/src/image.cpp
--- pipenightdreams-0.10.0.orig/src/image.cpp 2002-01-17 20:56:32.000000000 +0100
+++ pipenightdreams-0.10.0/src/image.cpp 2006-04-04 21:30:44.000000000 +0200
@@ -19,7 +19,7 @@
#include "SDL_image.h"
#include <stdio.h>
-Image::Image(Str * filename=NULL):Graphic(){
+Image::Image(Str * filename):Graphic(){
if (filename) load(filename);
}
diff -ur pipenightdreams-0.10.0.orig/src/list.cpp pipenightdreams-0.10.0/src/list.cpp
--- pipenightdreams-0.10.0.orig/src/list.cpp 2002-01-17 20:56:35.000000000 +0100
+++ pipenightdreams-0.10.0/src/list.cpp 2006-04-04 21:30:27.000000000 +0200
@@ -125,7 +125,7 @@
return (insert(indexOf(i), obj));
}
-List::Result List::remove(Index * index, bool del=false){
+List::Result List::remove(Index * index, bool del){
if (isEmpty()) return EmptyList;
if (!index) return NullIndex;
@@ -155,7 +155,7 @@
return Removed;
}
-void List::empty(bool del=true){
+void List::empty(bool del){
while (!isEmpty())
remove(getFirst(), del);
}
diff -ur pipenightdreams-0.10.0.orig/src/pipe.cpp pipenightdreams-0.10.0/src/pipe.cpp
--- pipenightdreams-0.10.0.orig/src/pipe.cpp 2002-01-21 05:08:13.000000000 +0100
+++ pipenightdreams-0.10.0/src/pipe.cpp 2006-04-04 21:29:23.000000000 +0200
@@ -43,11 +43,11 @@
return !(full_level>0) && !fixed;
}
-void Pipe::setFixed(bool flag=true){
+void Pipe::setFixed(bool flag){
fixed=flag;
}
-void Pipe::setBonus(Bonus bonus=NormalBonus){
+void Pipe::setBonus(Bonus bonus){
this->bonus=bonus;
}
diff -ur pipenightdreams-0.10.0.orig/src/player.h pipenightdreams-0.10.0/src/player.h
--- pipenightdreams-0.10.0.orig/src/player.h 2002-01-17 20:56:40.000000000 +0100
+++ pipenightdreams-0.10.0/src/player.h 2006-04-04 21:29:52.000000000 +0200
@@ -47,8 +47,8 @@
void setStartRowColumn(int row, int column);
void setBoard(Board * bd);
- inline void setRestrictionCoef(unsigned int coef);
- inline void setFixedCoef(unsigned int coef);
+ void setRestrictionCoef(unsigned int coef);
+ void setFixedCoef(unsigned int coef);
void incLives();
void decLives();
diff -ur pipenightdreams-0.10.0.orig/src/pointer.cpp pipenightdreams-0.10.0/src/pointer.cpp
--- pipenightdreams-0.10.0.orig/src/pointer.cpp 2002-01-17 20:56:41.000000000 +0100
+++ pipenightdreams-0.10.0/src/pointer.cpp 2006-04-04 21:28:25.000000000 +0200
@@ -17,7 +17,7 @@
#include "pointer.h"
-Pointer::Pointer(int row=0, int column=0){
+Pointer::Pointer(int row, int column){
this->row=row;
this->column=column;
this->moved_flag=true;
diff -ur pipenightdreams-0.10.0.orig/src/score.cpp pipenightdreams-0.10.0/src/score.cpp
--- pipenightdreams-0.10.0.orig/src/score.cpp 2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/score.cpp 2006-04-04 21:28:07.000000000 +0200
@@ -18,7 +18,7 @@
#include "score.h"
#include <math.h>
-Score::Score(int value=0){
+Score::Score(int value){
this->value=value;
delta=0;
changed=true;
diff -ur pipenightdreams-0.10.0.orig/src/str.cpp pipenightdreams-0.10.0/src/str.cpp
--- pipenightdreams-0.10.0.orig/src/str.cpp 2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/str.cpp 2006-04-04 21:27:43.000000000 +0200
@@ -11,7 +11,7 @@
const char Str::nul = '\0';
-Str::Str(const char * string=NULL){
+Str::Str(const char * string){
s=NULL;
set(string);
}
@@ -25,7 +25,7 @@
if (s) delete[] s;
}
-void Str::set(const char * string=NULL){
+void Str::set(const char * string){
if (s) delete[] s;
if (string){
s=new char[strlen(string)+1];
@@ -71,7 +71,7 @@
return (strlen(s));
}
-bool Str::isEqual(Str * str, bool case_sensitive = true){
+bool Str::isEqual(Str * str, bool case_sensitive){
if (case_sensitive){
return (!strcmp(s, str->s));
}
--- pipenightdreams-0.10.0/src/pointer.h~ 2006-04-04 21:58:38.000000000 +0200
+++ pipenightdreams-0.10.0/src/pointer.h 2006-04-04 21:58:38.000000000 +0200
@@ -43,11 +43,11 @@
friend class Board;
- inline void setRow(int row);
- inline void setColumn(int column);
- inline void setRowColumn(int row, int column);
- inline void setMoved(bool flag);
- inline bool moved();
+ void setRow(int row);
+ void setColumn(int column);
+ void setRowColumn(int row, int column);
+ void setMoved(bool flag);
+ bool moved();
Str * image_name;
Image * ima;
--- NEW FILE pipenightdreams.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Pipe Night Dreams
GenericName=Pipe Puzzle Game
Comment=Connect the waterpipes to create a proper pipeline
Exec=pipenightdreams
Icon=pipenightdreams.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=0.10.0
--- NEW FILE pipenightdreams.spec ---
Name: pipenightdreams
Version: 0.10.0
Release: 1%{?dist}
Summary: Connect the waterpipes to create a proper pipeline
Group: Amusements/Games
License: GPL
URL: http://www.libsdl.org/projects/pipenightdreams/
Source0: http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-0.10.0.tar.gz
Source1: %{name}.desktop
Patch0: pipenightdreams-0.10.0-gcc41.patch
Patch1: pipenightdreams-0.10.0-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL_image-devel desktop-file-utils
%description
PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
with increasing difficulty, and you can create your own by just editing
text files. It has a lot of cool graphics, score, lives, required pipes
per level and an easy and fast interface.
%prep
%setup -q
%patch0 -p1 -z .gcc41
%patch1 -p1 -z .gcc41
%build
%configure
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/SDL"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# fix up the broken datadir install (its this or patch a zillion makefiles)
mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
rmdir $RPM_BUILD_ROOT%{_datadir}/games
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -p -m 644 images/pipes_space/horizontal.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/pipenightdreams.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%changelog
* Wed Apr 5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
- initial Fedora Extras package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Apr 2006 11:11:13 -0000 1.1
+++ .cvsignore 7 Apr 2006 11:12:45 -0000 1.2
@@ -0,0 +1 @@
+pipenightdreams-0.10.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Apr 2006 11:11:13 -0000 1.1
+++ sources 7 Apr 2006 11:12:45 -0000 1.2
@@ -0,0 +1 @@
+f22f23649852f54cca43de775e691de6 pipenightdreams-0.10.0.tar.gz
More information about the fedora-extras-commits
mailing list