Packman Build Service PMBS

onscripter.spec Changed

@@ -27,23 +27,22 @@
 Source:         http://onscripter.osdn.jp/%{name}-%{version}.tar.gz
 Patch0:         onscripter-en.patch
 Patch1:         onscripter-avifile-47.patch
-Patch2:         onscripter-lua.patch
-Patch3:         onscripter.cflags.patch
-Patch4:         onscripter.smpeg.patch
+Patch2:         onscripter.patch
 BuildRequires:  docbook2x
-BuildRequires:  fontconfig-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libSDL_image-devel
-BuildRequires:  libSDL_mixer-devel
-BuildRequires:  libSDL_ttf-devel
-BuildRequires:  libavifile-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  pkgconfig(lua)
 BuildRequires:  pkg-config
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(SDL_image)
+BuildRequires:  pkgconfig(SDL_mixer)
+BuildRequires:  pkgconfig(SDL_ttf)
+BuildRequires:  pkgconfig(avifile)
+BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(lua)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisfile)
 
 %description
 ONScripter is a game engine compatible to NScripter, which is used
@@ -52,15 +51,10 @@
 This package provides patched English version only.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autosetup -p1
 
 %build
-make %{?_smp_mflags} -f Makefile.Linux EXTRA_CFLAGS='%{optflags}'
+%make_build -f Makefile.Linux 'EXTRA_CFLAGS=%{optflags}'
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -72,8 +66,8 @@
 install -m 0755 simple_aviplay %{buildroot}%{_bindir}
 
 %files
-%defattr(-,root,root)
-%doc README COPYING www/ogapee.css www/onscripter.html
+%doc README www/ogapee.css www/onscripter.html
+%license COPYING
 %{_bindir}/*
 
 %changelog

onscripter-lua.patch Deleted

onscripter.cflags.patch Deleted

onscripter.patch Added

@@ -0,0 +1,66 @@
+--- a/Makefile.Linux
++++ b/Makefile.Linux
+@@ -15,24 +15,24 @@ TARGET = onscripter$(EXESUFFIX) \
+ 	sarconv$(EXESUFFIX) \
+ 	nsaconv$(EXESUFFIX) 
+ EXT_OBJS = 
++DEFS=
++INCS=
++LIBS=
+ 
+ # mandatory: SDL, SDL_ttf, SDL_image, SDL_mixer, bzip2, libjpeg
+-DEFS = -DLINUX
+-INCS = `sdl-config --cflags`
+-LIBS = `sdl-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -ljpeg -lm
+-
+-# recommended: smpeg
+-DEFS += -DUSE_SMPEG
+-INCS += `smpeg-config --cflags`
+-LIBS += `smpeg-config --libs`
++DEFS += -DLINUX
++INCS += `pkg-config --cflags sdl SDL_ttf SDL_image SDL_mixer bzip2 libjpeg`
++LIBS += `pkg-config --libs   sdl SDL_ttf SDL_image SDL_mixer bzip2 libjpeg`
+ 
+ # recommended: fontconfig (to get default font)
+ DEFS += -DUSE_FONTCONFIG
+-LIBS += -lfontconfig
++INCS += `pkg-config --cflags fontconfig`
++LIBS += `pkg-config --libs   fontconfig`
+ 
+ # recommended: OggVorbis 
+ DEFS += -DUSE_OGG_VORBIS
+-LIBS += -logg -lvorbis -lvorbisfile
++INCS += `pkg-config --cflags ogg vorbis vorbisfile`
++LIBS += `pkg-config --libs   ogg vorbis vorbisfile`
+ 
+ # optional: Integer OggVorbis
+ #DEFS += -DUSE_OGG_VORBIS -DINTEGER_OGG_VORBIS
+@@ -43,15 +43,15 @@ DEFS += -DUSE_CDROM
+ 
+ # optional: avifile
+ DEFS += -DUSE_AVIFILE
+-INCS += `avifile-config --cflags`
+-LIBS += `avifile-config --libs`
++INCS += `pkg-config --cflags avifile`
++LIBS += `pkg-config --libs   avifile`
+ TARGET += simple_aviplay$(EXESUFFIX)
+ EXT_OBJS += AVIWrapper$(OBJSUFFIX)
+ 
+ # optional: lua
+ DEFS += -DUSE_LUA
+-INCS += -I/usr/include/lua5.1
+-LIBS += -llua5.1
++INCS += `pkg-config --cflags lua`
++LIBS += `pkg-config --libs   lua`
+ EXT_OBJS += LUAHandler$(OBJSUFFIX)
+ 
+ # optional: force screen width for PDA
+@@ -66,7 +66,7 @@ CC = g++
+ LD = g++ -o
+ 
+ #CFLAGS = -g -Wall -pipe -c $(INCS) $(DEFS)
+-CFLAGS = -O3 -Wall -fomit-frame-pointer -pipe -c $(INCS) $(DEFS)
++CFLAGS = $(EXTRA_CFLAGS) -c $(INCS) $(DEFS)
+ 
+ # for GCC on PowerPC specfied
+ #CC = powerpc-unknown-linux-gnu-g++

onscripter.smpeg.patch Deleted

Changes of Revision 6