rpms/flobopuyo/devel flobopuyo-0.20-64bit.patch, NONE, 1.1 flobopuyo-0.20-Makefile.patch, NONE, 1.1 flobopuyo.desktop, NONE, 1.1 flobopuyo.png, NONE, 1.1 flobopuyo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andrea Musuruane (musuruan) fedora-extras-commits at redhat.com
Mon Mar 24 18:00:04 UTC 2008


Author: musuruan

Update of /cvs/pkgs/rpms/flobopuyo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28863/devel

Modified Files:
	.cvsignore sources 
Added Files:
	flobopuyo-0.20-64bit.patch flobopuyo-0.20-Makefile.patch 
	flobopuyo.desktop flobopuyo.png flobopuyo.spec 
Log Message:
First import


flobopuyo-0.20-64bit.patch:

--- NEW FILE flobopuyo-0.20-64bit.patch ---
--- IosVector.cpp.orig	2006-08-16 16:48:48.000000000 -0700
+++ IosVector.cpp	2006-08-16 16:49:05.000000000 -0700
@@ -102,6 +102,6 @@
 void IosVector::dumpVector() const {
 	fprintf(stderr, "Size: %d\n", getSize());
 	for (int i = 0, j = getSize() ; i < j ; i++)
-		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));
+		fprintf(stderr, "elt[%ld]=%ld ", i, (long)getElementAt(i));
 	fprintf(stderr, "\n");
 }
--- PuyoGame.cpp.orig	2006-08-16 16:51:20.000000000 -0700
+++ PuyoGame.cpp	2006-08-16 16:55:30.000000000 -0700
@@ -45,7 +45,7 @@
 		return (PuyoState)newItem;
 	}
 	else
-		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));
+		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));
 }
 
 PuyoPuyo::PuyoPuyo(PuyoState state)

flobopuyo-0.20-Makefile.patch:

--- NEW FILE flobopuyo-0.20-Makefile.patch ---
diff -durN flobopuyo-0.20.orig/Makefile flobopuyo-0.20/Makefile
--- flobopuyo-0.20.orig/Makefile	2004-10-09 00:41:12.000000000 +0200
+++ flobopuyo-0.20/Makefile	2008-02-10 14:41:48.000000000 +0100
@@ -13,8 +13,8 @@
 
 # Unix/Linux settings
 PREFIX=/usr/local
-DATADIR=$(PREFIX)/share/games/flobopuyo
-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
+DATADIR=$(PREFIX)/share/flobopuyo
+INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin
 INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
 
 # Mac settings
@@ -44,12 +44,12 @@
 CC=g++
 CXX=g++
 
-CFLAGS= -DDATADIR=\"${DATADIR}\"
-LDFLAGS=
+CFLAGS+= -DDATADIR=\"${DATADIR}\"
 
 ifneq ($(PLATFORM), $(CYGWIN_VERSION))
 CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
+LDFLAGS:=$(LDFLAGS)
+LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
 endif
 
 HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
@@ -78,7 +78,8 @@
 # Win32
 ifeq ($(PLATFORM), $(CYGWIN_VERSION))
 CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
+LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
+LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
 endif
 
 ifeq ($(ENABLE_AUDIO), true)
@@ -90,7 +91,8 @@
 CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
 OBJFILES:=$(OBJFILES) glSDL.o
 ifeq ($(PLATFORM), Linux)
-LDFLAGS:=$(LDFLAGS) -lGL
+LDFLAGS:=$(LDFLAGS)
+LIBS:=$(LIBS) -lGL
 endif
 endif
 
@@ -110,25 +112,17 @@
 all: prelude flobopuyo
 
 flobopuyo: ${OBJFILES}
-	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
-	@echo "--------------------------------------"
-	@echo " Compilation finished"
-	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
-	@echo
-	@echo " Type ./flobopuyo to play."
-	@echo "--------------------------------------"
+	$(CXX) $(CFLAGS) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
 
 prelude:
-	@rm -f WARNINGS
-	@touch WARNINGS
 	@echo "Compiling with CFLAGS=$(CFLAGS)"
 	@echo "Compiling with LDFLAGS=$(LDFLAGS)"
 
 %.o:%.c
-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
+	$(CC) $(CFLAGS) -c $< 
 
 %.o:%.cpp
-	@echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
+	$(CXX) $(CFLAGS) -c $<
 
 PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
 HiScores.o:HiScores.cpp HiScores.h preferences.h
@@ -155,22 +149,20 @@
 IosException.o:IosException.cpp
 IosVector.o:IosVector.cpp
 glSDL.o:glSDL.c
-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-	@rm -f EXT_WARNINGS
+	$(CC) $(CFLAGS) -c $<
 SDL_prim.o:SDL_prim.c
-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-	@rm -f EXT_WARNINGS
+	$(CC) $(CFLAGS) -c $<
 corona.o:corona.cpp
 corona32.o:corona32.cpp
 corona_palette.o:corona_palette.cpp	
 
 scenar.l.c:scenar.l ${HFILES}
-	@echo "[$@]" && flex -oscenar.l.c scenar.l
+	flex -oscenar.l.c scenar.l
 scenar.y.c:scenar.y ${HFILES}
-	@echo "[$@]" && bison -y -d -o scenar.y.c scenar.y
+	bison -y -d -o scenar.y.c scenar.y
 
 clean:
-	rm -f *~ scenar.y.c scenar.y.h scenar.l.c *.o flobopuyo* WARNINGS
+	rm -f *~ scenar.y.c scenar.y.h scenar.l.c *.o flobopuyo*
 	rm -rf .xvpics data/.xvpics    data/*/.xvpics
 	rm -rf $(bundle_name)
 	rm -rf $(macimage_name)
@@ -178,7 +170,6 @@
 	rm -f  .DS_Store */.DS_Store */*/.DS_Store .gdb_history
 
 install: flobopuyo
-	strip flobopuyo
 	mkdir -p ${INSTALL_BINDIR}
 	mkdir -p ${INSTALL_DATADIR}
 	cp -r data/* ${INSTALL_DATADIR}
@@ -191,10 +182,8 @@
 	chmod a+rx ${INSTALL_BINDIR}/flobopuyo
 
 flobopuyo-static: prelude  ${OBJFILES}
-	@echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
+	$(CXX) $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
         /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
-	@echo "--------------------------------------"
-	@echo " Compilation finished"
 
 bundle: flobopuyo-static
 	mkdir -p $(bundle_name)/Contents/MacOS
@@ -207,7 +196,6 @@
 	rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS
 	rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics
 	rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store
-	strip $(bundle_name)/Contents/MacOS/flobopuyo
 
 mac-package: bundle
 	mkdir -p $(macimage_name)


--- NEW FILE flobopuyo.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Flobopuyo
GenericName=2 player Falling dots game
Comment=Match the dots to confound your opponent
Exec=flobopuyo
Icon=flobopuyo
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;BlocksGame;


--- NEW FILE flobopuyo.spec ---
Name:           flobopuyo
Version:        0.20
Release:        4%{?dist}
Summary:        2-player falling bubbles game

Group:          Amusements/Games
License:        GPLv2+
URL:            http://www.ios-software.com/?page=projet&quoi=29
# The upstream source link is a php script that sends the file.  This
# works fine for wget and curl, but confuses rpmbuild when it wants to unpack
# the source tarball.
#Source0:        http://www.ios-software.com/download.php3?what=20151&lg=AN
Source0:        %{name}-%{version}.tgz
Source1:        %{name}.desktop
# Icon converted with icns2png
Source2:        %{name}.png
# Wart
Patch0:         %{name}-0.20-64bit.patch
# Andrea Musuruane
Patch1:         %{name}-0.20-Makefile.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  flex 
BuildRequires:  bison 
BuildRequires:  SDL_mixer-devel 
BuildRequires:  SDL_image-devel 
BuildRequires:  desktop-file-utils
Requires:       hicolor-icon-theme


%description
A two-player falling bubbles game.  The goal is to make groups of four or more
Puyos (colored bubbles) to make them explode and send bad ghost Puyos to your
opponent.  You win the game if your opponent reaches the top of the board. You
can play against computer or another human.


%prep
%setup -q
%patch0
%patch1 -p1

# Fix end-of-line-encoding
sed -i 's/\r//' COPYING

# Remove AppleDouble files
rm data/sfx/._bi


%build
export CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags} PREFIX=%{_prefix}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} PREFIX=%{_prefix}

# Install man page
install -d -m 755 %{buildroot}%{_mandir}/man6
install -m 644 man/%{name}.6 %{buildroot}%{_mandir}/man6

# Install desktop file
desktop-file-install --vendor fedora \
        --dir %{buildroot}%{_datadir}/applications \
        %{SOURCE1}

# Install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/


%clean
rm -rf %{buildroot}

%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 COPYING TODO Changelog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_mandir}/man6/%{name}.6*


%changelog
* Mon Mar 24 2008 Andrea Musuruane <musuruan at gmail.com> 0.20-4
- Reverted license to GPLv2+

* Sun Mar 23 2008 Andrea Musuruane <musuruan at gmail.com> 0.20-3
- Fixed License tag
- Improved macro usage

* Sun Feb 10 2008 Andrea Musuruane <musuruan at gmail.com> 0.20-2
- Fixed license
- Added a patch to fix Makefile
- Added hicolor-icon-theme to Requires
- Fixed desktop file
- Fixed desktop file install
- Used converted mac icon
- Updated icon cache scriptlets to be compliant to new guidelines
- Improved macro usage
- Installed man page
- Cosmetic changes

* Wed Aug 16 2006 Wart <wart at kobold dot ort> 0.20-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/flobopuyo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2008 16:52:52 -0000	1.1
+++ .cvsignore	24 Mar 2008 17:59:23 -0000	1.2
@@ -0,0 +1 @@
+flobopuyo-0.20.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/flobopuyo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2008 16:52:52 -0000	1.1
+++ sources	24 Mar 2008 17:59:23 -0000	1.2
@@ -0,0 +1 @@
+88961898c9dd48b60464f6f10f695b8b  flobopuyo-0.20.tgz




More information about the fedora-extras-commits mailing list