rpmfusion-commits
February 2009
rpmfusion-commits@lists.rpmfusion.org
- 17 participants
- 362 discussions
rpms/sdlmame/F-9 sdlmame.spec,1.38,1.39
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12492/F-9
Modified Files:
sdlmame.spec
Log Message:
- Use macro style instead of variable style for build root and optimisation flags
- Fix the typo in changelog
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sdlmame.spec 26 Feb 2009 16:33:01 -0000 1.38
+++ sdlmame.spec 27 Feb 2009 17:26:42 -0000 1.39
@@ -129,52 +129,52 @@
%build
make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# create directories
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/cheats
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/cfg
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/comments
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/diff
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/ini
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/inp
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/memcard
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/nvram
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/snap
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/sta
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_datadir}/mame/artwork
+install -d %{buildroot}%{_datadir}/mame/chds
+install -d %{buildroot}%{_datadir}/mame/ctrlr
+install -d %{buildroot}%{_datadir}/mame/effects
+install -d %{buildroot}%{_datadir}/mame/fonts
+install -d %{buildroot}%{_datadir}/mame/keymaps
+install -d %{buildroot}%{_datadir}/mame/roms
+install -d %{buildroot}%{_datadir}/mame/samples
+install -d %{buildroot}%{_datadir}/mame/cheats
+install -d %{buildroot}%{_sysconfdir}/mame
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/cfg
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/comments
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/diff
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/ini
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/inp
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/memcard
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/nvram
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/snap
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/sta
# install binaries and config files
-install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 644 ui.bdf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mame/fonts
+install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame
+install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps
+install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts
install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \
- testkeys $RPM_BUILD_ROOT%{_bindir}
+ testkeys %{buildroot}%{_bindir}
for tool in regrep runtest src2html srcclean
do
-install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/mame-$tool
+install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
done
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
15 years, 10 months
- 1
- 0
rpms/sdlmame/F-10 sdlmame.spec,1.40,1.41
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12492/F-10
Modified Files:
sdlmame.spec
Log Message:
- Use macro style instead of variable style for build root and optimisation flags
- Fix the typo in changelog
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sdlmame.spec 26 Feb 2009 16:28:15 -0000 1.40
+++ sdlmame.spec 27 Feb 2009 17:26:42 -0000 1.41
@@ -129,52 +129,52 @@
%build
make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# create directories
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/cheats
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/cfg
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/comments
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/diff
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/ini
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/inp
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/memcard
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/nvram
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/snap
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/sta
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_datadir}/mame/artwork
+install -d %{buildroot}%{_datadir}/mame/chds
+install -d %{buildroot}%{_datadir}/mame/ctrlr
+install -d %{buildroot}%{_datadir}/mame/effects
+install -d %{buildroot}%{_datadir}/mame/fonts
+install -d %{buildroot}%{_datadir}/mame/keymaps
+install -d %{buildroot}%{_datadir}/mame/roms
+install -d %{buildroot}%{_datadir}/mame/samples
+install -d %{buildroot}%{_datadir}/mame/cheats
+install -d %{buildroot}%{_sysconfdir}/mame
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/cfg
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/comments
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/diff
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/ini
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/inp
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/memcard
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/nvram
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/snap
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/sta
# install binaries and config files
-install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 644 ui.bdf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mame/fonts
+install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame
+install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps
+install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts
install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \
- testkeys $RPM_BUILD_ROOT%{_bindir}
+ testkeys %{buildroot}%{_bindir}
for tool in regrep runtest src2html srcclean
do
-install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/mame-$tool
+install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
done
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -213,7 +213,7 @@
%changelog
* Thu Feb 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.5.0129u5
-- Updated to 0.129u4
+- Updated to 0.129u5
- Use macros consistently
- Fixed whatsnew.txt encoding
15 years, 10 months
- 1
- 0
rpms/sdlmame/devel sdlmame.spec,1.39,1.40
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12492/devel
Modified Files:
sdlmame.spec
Log Message:
- Use macro style instead of variable style for build root and optimisation flags
- Fix the typo in changelog
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sdlmame.spec 26 Feb 2009 16:22:09 -0000 1.39
+++ sdlmame.spec 27 Feb 2009 17:26:42 -0000 1.40
@@ -131,52 +131,52 @@
%build
make %{?_smp_mflags} %{?arch_flags} TARGET=ldplayer SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} DEBUG=1 SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
make %{?_smp_mflags} %{?arch_flags} SYMBOLS=1 OPTIMIZE=2\
- OPT_FLAGS='$RPM_OPT_FLAGS -DINI_PATH="\"%{_sysconfdir}/mame;\""'
+ OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/mame;\""'
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# create directories
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/artwork
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/chds
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/ctrlr
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/effects
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/fonts
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/roms
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/samples
-install -d $RPM_BUILD_ROOT%{_datadir}/mame/cheats
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/cfg
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/comments
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/diff
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/ini
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/inp
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/memcard
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/nvram
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/snap
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mame/sta
+install -d %{buildroot}%{_bindir}
+install -d %{buildroot}%{_datadir}/mame/artwork
+install -d %{buildroot}%{_datadir}/mame/chds
+install -d %{buildroot}%{_datadir}/mame/ctrlr
+install -d %{buildroot}%{_datadir}/mame/effects
+install -d %{buildroot}%{_datadir}/mame/fonts
+install -d %{buildroot}%{_datadir}/mame/keymaps
+install -d %{buildroot}%{_datadir}/mame/roms
+install -d %{buildroot}%{_datadir}/mame/samples
+install -d %{buildroot}%{_datadir}/mame/cheats
+install -d %{buildroot}%{_sysconfdir}/mame
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/cfg
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/comments
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/diff
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/ini
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/inp
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/memcard
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/nvram
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/snap
+install -d %{buildroot}%{_sysconfdir}/skel/.mame/sta
# install binaries and config files
-install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
-install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 644 ui.bdf %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/mame/fonts
+install -pm 644 mame.ini %{buildroot}%{_sysconfdir}/mame
+install -pm 644 keymaps/* %{buildroot}%{_datadir}/mame/keymaps
+install -pm 644 ui.bdf %{SOURCE1} %{buildroot}%{_datadir}/mame/fonts
install -pm 755 chdman jedutil ldplayer ldresample ldverify mame mamed romcmp \
- testkeys $RPM_BUILD_ROOT%{_bindir}
+ testkeys %{buildroot}%{_bindir}
for tool in regrep runtest src2html srcclean
do
-install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/mame-$tool
+install -pm 755 $tool %{buildroot}%{_bindir}/mame-$tool
done
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -215,7 +215,7 @@
%changelog
* Thu Feb 26 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0130-0.5.0129u5
-- Updated to 0.129u4
+- Updated to 0.129u5
- Use macros consistently
- Fixed whatsnew.txt encoding
15 years, 10 months
- 1
- 0
rpms/vlc/devel 0001-Mozilla-SDK-libxul-1.9.1-support.patch,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18956
Modified Files:
0001-Mozilla-SDK-libxul-1.9.1-support.patch
Log Message:
rebuild for new font name
0001-Mozilla-SDK-libxul-1.9.1-support.patch:
Index: 0001-Mozilla-SDK-libxul-1.9.1-support.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/0001-Mozilla-SDK-libxul-1.9.1-support.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 0001-Mozilla-SDK-libxul-1.9.1-support.patch 16 Feb 2009 10:11:51 -0000 1.4
+++ 0001-Mozilla-SDK-libxul-1.9.1-support.patch 27 Feb 2009 09:01:02 -0000 1.5
@@ -1,8 +1,229 @@
+diff --git a/projects/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
+index ccc3945..43466c0 100644
+--- a/projects/mozilla/support/npmac.cpp
++++ b/projects/mozilla/support/npmac.cpp
+@@ -54,7 +54,11 @@
+ #undef XP_UNIX
+ #endif
+
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ #include "npupp.h"
++#else
++#include "npfunctions.h"
++#endif
+
+ #ifdef __MWERKS__
+ #ifndef powerc
+@@ -130,7 +134,7 @@ static inline void* SetupFPtoTVGlue(TFPtoTVGlue* functionGlue, void* fp)
+
+ // glue for mapping netscape TVectors to Macho function pointers
+ struct TTVtoFPGlue {
+- uint32 glue[6];
++ uint32_t glue[6];
+ };
+
+ static struct {
+@@ -252,7 +256,7 @@ NPError NPN_GetURL(NPP instance, const char* url, const char* window)
+ return CallNPN_GetURLProc(gNetscapeFuncs.geturl, instance, url, window);
+ }
+
+-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
++NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
+ {
+ int navMinorVers = gNetscapeFuncs.version & 0xFF;
+ NPError err;
+@@ -269,7 +273,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin
+ return err;
+ }
+
+-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
++NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
+ {
+ return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance, url, window, len, buf, file);
+ }
+@@ -295,7 +299,7 @@ NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* window, NPStrea
+ return err;
+ }
+
+-int32 NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
++int32_t NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
+ {
+ int navMinorVers = gNetscapeFuncs.version & 0xFF;
+ NPError err;
+@@ -337,7 +341,7 @@ const char* NPN_UserAgent(NPP instance)
+ return CallNPN_UserAgentProc(gNetscapeFuncs.uagent, instance);
+ }
+
+-void* NPN_MemAlloc(uint32 size)
++void* NPN_MemAlloc(uint32_t size)
+ {
+ return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
+ }
+@@ -347,7 +351,7 @@ void NPN_MemFree(void* ptr)
+ CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
+ }
+
+-uint32 NPN_MemFlush(uint32 size)
++uint32_t NPN_MemFlush(uint32_t size)
+ {
+ return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
+ }
+@@ -594,18 +598,18 @@ void NPN_SetException(NPObject *npobj, const NPUTF8 *message)
+
+ NPError Private_Initialize(void);
+ void Private_Shutdown(void);
+-NPError Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved);
++NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
+ NPError Private_Destroy(NPP instance, NPSavedData** save);
+ NPError Private_SetWindow(NPP instance, NPWindow* window);
+ NPError Private_GetValue( NPP instance, NPPVariable variable, void *value );
+ NPError Private_SetValue( NPP instance, NPPVariable variable, void *value );
+ NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype);
+ NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason);
+-int32 Private_WriteReady(NPP instance, NPStream* stream);
+-int32 Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer);
++int32_t Private_WriteReady(NPP instance, NPStream* stream);
++int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer);
+ void Private_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
+ void Private_Print(NPP instance, NPPrint* platformPrint);
+-int16 Private_HandleEvent(NPP instance, void* event);
++int16_t Private_HandleEvent(NPP instance, void* event);
+ void Private_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
+ jobject Private_GetJavaClass(void);
+
+@@ -633,7 +637,7 @@ void Private_Shutdown(void)
+ ExitCodeResource();
+ }
+
+-NPError Private_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved)
++NPError Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
+ {
+ EnterCodeResource();
+ NPError ret = NPP_New(pluginType, instance, mode, argc, argn, argv, saved);
+@@ -692,9 +696,9 @@ NPError Private_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBoo
+ return err;
+ }
+
+-int32 Private_WriteReady(NPP instance, NPStream* stream)
++int32_t Private_WriteReady(NPP instance, NPStream* stream)
+ {
+- int32 result;
++ int32_t result;
+ EnterCodeResource();
+ PLUGINDEBUGSTR("\pWriteReady;g;");
+ result = NPP_WriteReady(instance, stream);
+@@ -702,9 +706,9 @@ int32 Private_WriteReady(NPP instance, NPStream* stream)
+ return result;
+ }
+
+-int32 Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer)
++int32_t Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer)
+ {
+- int32 result;
++ int32_t result;
+ EnterCodeResource();
+ PLUGINDEBUGSTR("\pWrite;g;");
+ result = NPP_Write(instance, stream, offset, len, buffer);
+@@ -730,9 +734,9 @@ NPError Private_DestroyStream(NPP instance, NPStream* stream, NPError reason)
+ return err;
+ }
+
+-int16 Private_HandleEvent(NPP instance, void* event)
++int16_t Private_HandleEvent(NPP instance, void* event)
+ {
+- int16 result;
++ int16_t result;
+ EnterCodeResource();
+ PLUGINDEBUGSTR("\pHandleEvent;g;");
+ result = NPP_HandleEvent(instance, event);
+@@ -993,6 +997,7 @@ DEFINE_API_C(NPError) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs,
+ //
+ pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+ pluginFuncs->size = sizeof(NPPluginFuncs);
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ pluginFuncs->newp = NewNPP_NewProc(PLUGIN_TO_HOST_GLUE(newp, Private_New));
+ pluginFuncs->destroy = NewNPP_DestroyProc(PLUGIN_TO_HOST_GLUE(destroy, Private_Destroy));
+ pluginFuncs->setwindow = NewNPP_SetWindowProc(PLUGIN_TO_HOST_GLUE(setwindow, Private_SetWindow));
+@@ -1004,9 +1009,26 @@ DEFINE_API_C(NPError) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs,
+ pluginFuncs->print = NewNPP_PrintProc(PLUGIN_TO_HOST_GLUE(print, Private_Print));
+ pluginFuncs->event = NewNPP_HandleEventProc(PLUGIN_TO_HOST_GLUE(event, Private_HandleEvent));
+ pluginFuncs->getvalue = NewNPP_GetValueProc(PLUGIN_TO_HOST_GLUE(getvalue, Private_GetValue));
++#else
++ pluginFuncs->newp = (NPP_NewProcPtr)(PLUGIN_TO_HOST_GLUE(newp, Private_New));
++ pluginFuncs->destroy = (NPP_DestroyProcPtr)(PLUGIN_TO_HOST_GLUE(destroy, Private_Destroy));
++ pluginFuncs->setwindow = (NPP_SetWindowProcPtr)(PLUGIN_TO_HOST_GLUE(setwindow, Private_SetWindow));
++ pluginFuncs->newstream = (NPP_NewStreamProcPtr)(PLUGIN_TO_HOST_GLUE(newstream, Private_NewStream));
++ pluginFuncs->destroystream = (NPP_DestroyStreamProcPtr)(PLUGIN_TO_HOST_GLUE(destroystream, Private_DestroyStream));
++ pluginFuncs->asfile = (NPP_StreamAsFileProcPtr)(PLUGIN_TO_HOST_GLUE(asfile, Private_StreamAsFile));
++ pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(PLUGIN_TO_HOST_GLUE(writeready, Private_WriteReady));
++ pluginFuncs->write = (NPP_WriteProcPtr)(PLUGIN_TO_HOST_GLUE(write, Private_Write));
++ pluginFuncs->print = (NPP_PrintProcPtr)(PLUGIN_TO_HOST_GLUE(print, Private_Print));
++ pluginFuncs->event = (NPP_HandleEventProcPtr)(PLUGIN_TO_HOST_GLUE(event, Private_HandleEvent));
++ pluginFuncs->getvalue = (NPP_GetValueProcPtr)(PLUGIN_TO_HOST_GLUE(getvalue, Private_GetValue));
++#endif
+ if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
+ {
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ pluginFuncs->urlnotify = NewNPP_URLNotifyProc(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));
++#else
++ pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));
++#endif
+ }
+ #ifdef OJI
+ if( navMinorVers >= NPVERS_HAS_LIVECONNECT )
+@@ -1016,7 +1038,11 @@ DEFINE_API_C(NPError) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs,
+ #else
+ pluginFuncs->javaClass = NULL;
+ #endif
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ *unloadUpp = NewNPP_ShutdownProc(PLUGIN_TO_HOST_GLUE(shutdown, Private_Shutdown));
++#else
++ *unloadUpp = (NPP_ShutdownProcPtr)(PLUGIN_TO_HOST_GLUE(shutdown, Private_Shutdown));
++#endif
+
+ SetUpQD();
+ err = Private_Initialize();
+@@ -1152,6 +1178,7 @@ NPError NP_GetEntryPoints(NPPluginFuncs* pluginFuncs)
+
+ pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+ pluginFuncs->size = sizeof(NPPluginFuncs);
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ pluginFuncs->newp = NewNPP_NewProc(Private_New);
+ pluginFuncs->destroy = NewNPP_DestroyProc(Private_Destroy);
+ pluginFuncs->setwindow = NewNPP_SetWindowProc(Private_SetWindow);
+@@ -1164,6 +1191,27 @@ NPError NP_GetEntryPoints(NPPluginFuncs* pluginFuncs)
+ pluginFuncs->event = NewNPP_HandleEventProc(Private_HandleEvent);
+ pluginFuncs->getvalue = NewNPP_GetValueProc(Private_GetValue);
+ pluginFuncs->setvalue = NewNPP_SetValueProc(Private_SetValue);
++#else
++ pluginFuncs->newp = (NPP_NewProcPtr)(Private_New);
++ pluginFuncs->destroy = (NPP_DestroyProcPtr)(Private_Destroy);
++ pluginFuncs->setwindow = (NPP_SetWindowProcPtr)(Private_SetWindow);
++ pluginFuncs->newstream = (NPP_NewStreamProcPtr)(Private_NewStream);
++ pluginFuncs->destroystream = (NPP_DestroyStreamProcPtr)(Private_DestroyStream);
++ pluginFuncs->asfile = (NPP_StreamAsFileProcPtr)(Private_StreamAsFile);
++ pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(Private_WriteReady);
++ pluginFuncs->write = (NPP_WriteProcPtr)(Private_Write);
++ pluginFuncs->print = (NPP_PrintProcPtr)(Private_Print);
++ pluginFuncs->event = (NPP_HandleEventProcPtr)(Private_HandleEvent);
++ pluginFuncs->getvalue = (NPP_GetValueProcPtr)(Private_GetValue);
++ pluginFuncs->setvalue = (NPP_SetValueProcPtr)(Private_SetValue);
++#endif
++ if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
++ {
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
++ pluginFuncs->urlnotify = NewNPP_URLNotifyProc(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));
++#else
++ pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));
++#endif
+ if( navMinorVers >= NPVERS_HAS_NOTIFICATION )
+ {
+ pluginFuncs->urlnotify = Private_URLNotify;
diff --git a/projects/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
-index 26c6736..b27b20d 100644
+index 26c6736..450d627 100644
--- a/projects/mozilla/support/npunix.c
+++ b/projects/mozilla/support/npunix.c
-@@ -43,7 +43,11 @@
+@@ -43,7 +43,132 @@
#include <stdio.h>
#include <npapi.h>
@@ -10,11 +231,196 @@
#include <npupp.h>
+#else
+#include <npfunctions.h>
++// For 1.9 compatibility
++// ------------------------------------------------
++typedef NPError (*NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
++#define NewNPN_GetValueProc(FUNC) \
++ ((NPN_GetValueUPP) (FUNC))
++#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3))
++
++typedef NPError (*NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
++#define NewNPN_SetValueProc(FUNC) \
++ ((NPN_SetValueUPP) (FUNC))
++#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3))
++
++typedef NPError (*NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
++#define NewNPN_GetURLProc(FUNC) \
++ ((NPN_GetURLUPP) (FUNC))
++#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3))
++
++typedef NPError (*NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
++#define NewNPN_GetURLNotifyProc(FUNC) \
++ ((NPN_GetURLNotifyUPP) (FUNC))
++#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
++
++typedef NPError (*NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file);
++#define NewNPN_PostURLProc(FUNC) \
++ ((NPN_PostURLUPP) (FUNC))
++#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
++
++typedef NPError (*NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData);
++#define NewNPN_PostURLNotifyProc(FUNC) \
++ ((NPN_PostURLNotifyUPP) (FUNC))
++#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
++
++typedef NPError (*NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
++#define NewNPN_RequestReadProc(FUNC) \
++ ((NPN_RequestReadUPP) (FUNC))
++#define CallNPN_RequestReadProc(FUNC, stream, range) \
++ (*(FUNC))((stream), (range))
++
++typedef NPError (*NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
++#define NewNPN_NewStreamProc(FUNC) \
++ ((NPN_NewStreamUPP) (FUNC))
++#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
++ (*(FUNC))((npp), (type), (window), (stream))
++
++typedef int32_t (*NPN_WriteUPP)(NPP instance, NPStream* stream, int32_t len, void* buffer);
++#define NewNPN_WriteProc(FUNC) \
++ ((NPN_WriteUPP) (FUNC))
++#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
++ (*(FUNC))((npp), (stream), (len), (buffer))
++
++typedef NPError (*NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
++#define NewNPN_DestroyStreamProc(FUNC) \
++ ((NPN_DestroyStreamUPP) (FUNC))
++#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
++ (*(FUNC))((npp), (stream), (reason))
++
++typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
++#define NewNPN_StatusProc(FUNC) \
++ ((NPN_StatusUPP) (FUNC))
++#define CallNPN_StatusProc(FUNC, npp, msg) \
++ (*(FUNC))((npp), (msg))
++
++typedef const char* (*NPN_UserAgentUPP)(NPP instance);
++#define NewNPN_UserAgentProc(FUNC) \
++ ((NPN_UserAgentUPP) (FUNC))
++#define CallNPN_UserAgentProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++typedef void* (*NPN_MemAllocUPP)(uint32_t size);
++#define NewNPN_MemAllocProc(FUNC) \
++ ((NPN_MemAllocUPP) (FUNC))
++#define CallNPN_MemAllocProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++typedef void (*NPN_MemFreeUPP)(void* ptr);
++#define NewNPN_MemFreeProc(FUNC) \
++ ((NPN_MemFreeUPP) (FUNC))
++#define CallNPN_MemFreeProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++typedef uint32_t (*NPN_MemFlushUPP)(uint32_t size);
++#define NewNPN_MemFlushProc(FUNC) \
++ ((NPN_MemFlushUPP) (FUNC))
++#define CallNPN_MemFlushProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages);
++#define NewNPN_ReloadPluginsProc(FUNC) \
++ ((NPN_ReloadPluginsUPP) (FUNC))
++#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++//NPN_GetJavaEnv NPN_GetJavaPeer
++
++typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
++#define NewNPN_InvalidateRectProc(FUNC) \
++ ((NPN_InvalidateRectUPP) (FUNC))
++#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
++ (*(FUNC))((ARG1), (ARG2))
++
++typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
++#define NewNPN_InvalidateRegionProc(FUNC) \
++ ((NPN_InvalidateRegionUPP) (FUNC))
++#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
++ (*(FUNC))((ARG1), (ARG2))
++
++typedef void (*NPN_ForceRedrawUPP)(NPP instance);
++#define NewNPN_ForceRedrawProc(FUNC) \
++ ((NPN_ForceRedrawUPP) (FUNC))
++#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
++ (*(FUNC))((ARG1))
++
++//NPN_GetStringIdentifier NPN_GetStringIdentifiers NPN_GetIntIdentifier NPN_IdentifierIsString
++//NPN_UTF8FromIdentifier NPN_IntFromIdentifier NPN_CreateObject
++
+#endif
/*
* Define PLUGIN_TRACE to have the wrapper functions print
-@@ -685,6 +689,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
+@@ -117,14 +242,14 @@ NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notify
+
+ NPError
+ NPN_PostURL(NPP instance, const char* url, const char* window,
+- uint32 len, const char* buf, NPBool file)
++ uint32_t len, const char* buf, NPBool file)
+ {
+ return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
+ url, window, len, buf, file);
+ }
+
+ NPError
+-NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len,
++NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
+ const char* buf, NPBool file, void* notifyData)
+ {
+ return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
+@@ -147,7 +272,7 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
+ }
+
+ int32
+-NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
++NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
+ {
+ return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
+ stream, len, buffer);
+@@ -173,7 +298,7 @@ NPN_UserAgent(NPP instance)
+ }
+
+ void*
+-NPN_MemAlloc(uint32 size)
++NPN_MemAlloc(uint32_t size)
+ {
+ return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
+ }
+@@ -183,7 +308,7 @@ void NPN_MemFree(void* ptr)
+ CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
+ }
+
+-uint32 NPN_MemFlush(uint32 size)
++uint32_t NPN_MemFlush(uint32_t size)
+ {
+ return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
+ }
+@@ -423,8 +548,8 @@ void NPN_SetException(NPObject *npobj, const NPUTF8 *message)
+ ***********************************************************************/
+
+ NPError
+-Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
+- int16 argc, char* argn[], char* argv[], NPSavedData* saved)
++Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
++ int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
+ {
+ NPError ret;
+ PLUGINDEBUGSTR("New");
+@@ -468,7 +593,7 @@ Private_WriteReady(NPP instance, NPStream* stream)
+ }
+
+ int32
+-Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
++Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
+ void* buffer)
+ {
+ unsigned int result;
+@@ -685,6 +810,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
*/
pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
pluginFuncs->size = sizeof(NPPluginFuncs);
@@ -22,7 +428,7 @@
pluginFuncs->newp = NewNPP_NewProc(Private_New);
pluginFuncs->destroy = NewNPP_DestroyProc(Private_Destroy);
pluginFuncs->setwindow = NewNPP_SetWindowProc(Private_SetWindow);
-@@ -697,9 +702,27 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
+@@ -697,9 +823,27 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
pluginFuncs->event = NULL;
pluginFuncs->getvalue = NewNPP_GetValueProc(Private_GetValue);
pluginFuncs->setvalue = NewNPP_SetValueProc(Private_SetValue);
@@ -50,3 +456,61 @@
}
#ifdef OJI
if( navMinorVers >= NPVERS_HAS_LIVECONNECT )
+diff --git a/projects/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
+index c277f84..2d08805 100644
+--- a/projects/mozilla/support/npwin.cpp
++++ b/projects/mozilla/support/npwin.cpp
+@@ -42,7 +42,11 @@
+ #endif
+
+ #include "npapi.h"
++#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
+ #include "npupp.h"
++#else
++#include "npfunctions.h"
++#endif
+
+ //\\// DEFINE
+ #define NP_EXPORT
+@@ -228,7 +232,7 @@ NPError NPN_GetURL(NPP instance, const char *url, const char *target)
+ return g_pNavigatorFuncs->geturl(instance, url, target);
+ }
+
+-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData)
++NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
+ {
+ int navMinorVers = g_pNavigatorFuncs->version & 0xFF;
+ NPError err;
+@@ -242,7 +246,7 @@ NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uin
+ }
+
+
+-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file)
++NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
+ {
+ return g_pNavigatorFuncs->posturl(instance, url, window, len, buf, file);
+ }
+@@ -276,11 +280,11 @@ NPError NPN_NewStream(NPP instance, NPMIMEType type,
+
+ /* Provides len bytes of data.
+ */
+-int32 NPN_Write(NPP instance, NPStream *stream,
+- int32 len, void *buffer)
++int32_t NPN_Write(NPP instance, NPStream *stream,
++ int32_t len, void *buffer)
+ {
+ int navMinorVersion = g_pNavigatorFuncs->version & 0xFF;
+- int32 result;
++ int32_t result;
+
+ if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) {
+ result = g_pNavigatorFuncs->write(instance, stream, len, buffer);
+@@ -327,7 +331,7 @@ const char* NPN_UserAgent(NPP instance)
+ */
+
+
+-void* NPN_MemAlloc(uint32 size)
++void* NPN_MemAlloc(uint32_t size)
+ {
+ return g_pNavigatorFuncs->memalloc(size);
+ }
15 years, 10 months
- 1
- 0
rpms/vlc/devel vlc.spec,1.26,1.27
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18492
Modified Files:
vlc.spec
Log Message:
Rename the font package
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vlc.spec 16 Feb 2009 08:21:33 -0000 1.26
+++ vlc.spec 27 Feb 2009 08:55:04 -0000 1.27
@@ -20,9 +20,9 @@
%else
Version: 0.9.9
%define _version %{version}
-%define release_tag 0.1rc
+%define release_tag 0.3rc
%endif
-Release: %{release_tag}%{?dist}.2
+Release: %{release_tag}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -183,7 +183,7 @@
Requires: vlc-core = %{version}-%{release}
%if 0%{?fedora} > 10
-Requires: dejavu-fonts-sans
+Requires: dejavu-sans-fonts
%else
Requires: dejavu-fonts
%endif
@@ -547,6 +547,9 @@
%changelog
+* Fri Feb 27 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.3rc
+- Rename the Required font package.
+
* Fri Feb 13 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.1rc
- Update to 0.9.9rc
- Move Xless binaries to the -core subpackage
15 years, 10 months
- 1
- 0
rpms/xbill/F-9 xbill-2.1-dropsgid.patch, NONE, 1.1 xbill-2.1-gtk2.patch, NONE, 1.1 xbill-2.1-hurd_logos.patch, NONE, 1.1 xbill-2.1-score.patch, NONE, 1.1 xbill.desktop, NONE, 1.1 xbill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xbill/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1237/F-9
Modified Files:
.cvsignore sources
Added Files:
xbill-2.1-dropsgid.patch xbill-2.1-gtk2.patch
xbill-2.1-hurd_logos.patch xbill-2.1-score.patch xbill.desktop
xbill.spec
Log Message:
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
xbill-2.1-dropsgid.patch:
--- NEW FILE xbill-2.1-dropsgid.patch ---
diff -dur xbill-2.1.orig/Game.c xbill-2.1/Game.c
--- xbill-2.1.orig/Game.c 2001-10-30 19:28:27.000000000 +0100
+++ xbill-2.1/Game.c 2008-12-26 10:08:56.000000000 +0100
@@ -304,6 +304,7 @@
int
main(int argc, char **argv) {
+ Scorelist_open();
srand(time(NULL));
parse_args(argc, argv);
UI_initialize(gui, &argc, argv);
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.c 2008-12-26 19:51:20.000000000 +0100
@@ -1,6 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "Scorelist.h"
#include "UI.h"
@@ -16,16 +18,33 @@
static Score scores[SCORES];
+FILE *scorefile;
+
+void
+Scorelist_open() {
+ gid_t realgid;
+
+ /* Open the scoreboard file. */
+ scorefile = fopen(SCOREFILE, "r+");
+
+ /* Figure out who we really are. */
+ realgid = getgid();
+
+ /* This is where we drop our setuid/setgid privileges. */
+ if (setresgid(-1, realgid, realgid) != 0) {
+ perror("Could not drop setgid privileges. Aborting.");
+ exit(1);
+ }
+}
+
void
Scorelist_read() {
- FILE *scorefile = fopen(SCOREFILE, "r");
int i;
if (scorefile != NULL) {
for (i = 0; i < SCORES; i++)
fscanf(scorefile, "%20s%d%d\n", scores[i].name,
&scores[i].level, &scores[i].score);
- fclose(scorefile);
}
else {
for (i = 0; i < SCORES; i++) {
@@ -38,10 +57,10 @@
void
Scorelist_write() {
- FILE *scorefile = fopen(SCOREFILE, "w");
int i;
if (scorefile == NULL)
return;
+ rewind(scorefile);
for (i = 0; i < SCORES; i++)
fprintf(scorefile, "%-*s %d %d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
diff -dur xbill-2.1.orig/Scorelist.h xbill-2.1/Scorelist.h
--- xbill-2.1.orig/Scorelist.h 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.h 2008-12-26 19:11:22.000000000 +0100
@@ -1,6 +1,7 @@
#ifndef SCORELIST_H
#define SCORELIST_H
+void Scorelist_open(void);
void Scorelist_read(void);
void Scorelist_write(void);
void Scorelist_recalc(const char *str, int level, int score);
xbill-2.1-gtk2.patch:
--- NEW FILE xbill-2.1-gtk2.patch ---
--- configure.in.old 2007-12-05 22:37:57.000000000 +0100
+++ configure.in 2007-12-05 22:54:57.000000000 +0100
@@ -88,12 +88,11 @@
[ --enable-gtk build with the GTK widget set])
if test "$enable_gtk" != "no"; then
- AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
- if test "X$GTKCONFIG" = X"yes"; then
+ if test $pkg_failed = no; then
AC_DEFINE(USE_GTK)
- GTK_CFLAGS="`gtk-config --cflags`"
- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
+ WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
WIDGET_OBJS="$WIDGET_OBJS gtk.o"
fi
fi
xbill-2.1-hurd_logos.patch:
--- NEW FILE xbill-2.1-hurd_logos.patch ---
--- xbill-2.1.orig/bitmaps/hurd.xbm
+++ xbill-2.1/bitmaps/hurd.xbm
@@ -1,10 +1,11 @@
#define hurd_width 28
#define hurd_height 24
-static char hurd_bits[] = {
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0xc4,0x22,0xef,0xf1,0xc4,0x22,0x2d,0xf3,0xc4,0x22,0x29,0xf3,0xc4,
- 0x22,0x2d,0xf2,0xfc,0x22,0x27,0xf2,0xc4,0x22,0x27,0xf2,0xc4,0x22,0x25,0xf3,
- 0xc4,0x36,0x2d,0xf3,0x04,0x1c,0xe9,0xf1,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0xf0};
+static unsigned char hurd_bits[] = {
+ 0x00, 0xfe, 0x00, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x00, 0xc7, 0x07, 0x00,
+ 0xc0, 0xc7, 0x1f, 0x00, 0x60, 0xc6, 0x79, 0x00, 0x30, 0xfe, 0xe0, 0x00,
+ 0x78, 0x7c, 0xc0, 0x01, 0xfc, 0x10, 0xfe, 0x01, 0xfe, 0x30, 0x7f, 0x03,
+ 0xc6, 0xb0, 0x43, 0x03, 0xc6, 0xe0, 0x43, 0x03, 0xc6, 0x80, 0x43, 0x03,
+ 0xfe, 0x00, 0x7f, 0x03, 0xfe, 0x00, 0xfe, 0x01, 0x78, 0x00, 0x98, 0x01,
+ 0x30, 0xfe, 0xf8, 0x00, 0x30, 0xfe, 0x78, 0x00, 0x30, 0xc6, 0x3f, 0x00,
+ 0x60, 0xc6, 0x0f, 0x00, 0x60, 0xc6, 0x06, 0x00, 0xc0, 0xfe, 0x06, 0x00,
+ 0xc0, 0xff, 0x03, 0x00, 0x80, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x00, 0x00 };
--- xbill-2.1.orig/pixmaps/hurd.xpm
+++ xbill-2.1/pixmaps/hurd.xpm
@@ -1,44 +1,176 @@
/* XPM */
static char * hurd_xpm[] = {
-"28 24 16 1",
-" c #aaaaaa",
-". c #71b6d6",
-"X c #5da4f1",
-"o c #5e91d7",
-"O c #3171c5",
-"+ c #3487ca",
-"@ c #2750a0",
-"# c #29d176",
-"$ c #77d8d9",
-"% c #21bf77",
-"& c #00ff00",
-"* c #10e13c",
-"= c #183571",
-"- c #16ef1a",
-"; c #25639c",
-": c #1f418a",
-/* pixels */
-" ",
-" ",
-" ",
-" .XXXo ",
-" XXXXXXOo ",
-" XXXXXXX+O ",
-" XXXXXXXX+O@ ",
-" # .#XX$#XX%%+@o### ",
-" & &&.&X$$&**&&&&=&&&&# ",
-" & &&.&$$$&**&O&&=& && ",
-" & &&.&$$$&**&O*&=& && ",
-" &---&&.&X$X&**&O&&=& & ",
-" &&&&&&.&XXX&**&&&-=& & ",
-" & &&.&XXX&%*&&&==& & ",
-" & &&X&*X%&+*&;&-;& && ",
-" & &&X&&%&&O*&@&&;&--&& ",
-" & --+%&&&+O*&:*&+&&&& ",
-" O+O+OO@@:=:O+ ",
-" oOOOO@@:==@$o ",
-" @@@@::==:XX ",
-" @::::==:@XX ",
-" ;=====:@o ",
-" @==:O ",
-" "};
+"28 24 149 2",
+" c #FFFFFF",
+". c #9C9C9C",
+"+ c #505050",
+"@ c #575757",
+"# c #464646",
+"$ c #D7D7D7",
+"% c #FEFEFE",
+"& c #7E7E7E",
+"* c #BDBDBD",
+"= c #EFEFEF",
+"- c #F0F0F0",
+"; c #7B7B7B",
+"> c #A5A5A5",
+", c #CCCCCC",
+"' c #F3F3F3",
+") c #D9D9D9",
+"! c #616161",
+"~ c #C8C8C8",
+"{ c #828282",
+"] c #161616",
+"^ c #9B9B9B",
+"/ c #D2D2D2",
+"( c #E8E8E8",
+"_ c #FBFBFB",
+": c #F8F8F8",
+"< c #979797",
+"[ c #535353",
+"} c #676767",
+"| c #474747",
+"1 c #C9C9C9",
+"2 c #818181",
+"3 c #111111",
+"4 c #808080",
+"5 c #6F6F6F",
+"6 c #5E5E5E",
+"7 c #595959",
+"8 c #ADADAD",
+"9 c #F9F9F9",
+"0 c #FCFCFC",
+"a c #707070",
+"b c #878787",
+"c c #7F7F7F",
+"d c #767676",
+"e c #BBBBBB",
+"f c #E4E4E4",
+"g c #515151",
+"h c #D4D4D4",
+"i c #B8B8B8",
+"j c #777777",
+"k c #FDFDFD",
+"l c #898989",
+"m c #4C4C4C",
+"n c #5A5A5A",
+"o c #5C5C5C",
+"p c #373737",
+"q c #CECECE",
+"r c #D5D5D5",
+"s c #4E4E4E",
+"t c #C4C4C4",
+"u c #BFBFBF",
+"v c #696969",
+"w c #AEAEAE",
+"x c #DADADA",
+"y c #F6F6F6",
+"z c #EBEBEB",
+"A c #D8D8D8",
+"B c #545454",
+"C c #E3E3E3",
+"D c #4D4D4D",
+"E c #E9E9E9",
+"F c #CFCFCF",
+"G c #6D6D6D",
+"H c #0D0D0D",
+"I c #242424",
+"J c #A4A4A4",
+"K c #E0E0E0",
+"L c #F4F4F4",
+"M c #585858",
+"N c #F2F2F2",
+"O c #D1D1D1",
+"P c #C0C0C0",
+"Q c #6E6E6E",
+"R c #DCDCDC",
+"S c #434343",
+"T c #7C7C7C",
+"U c #757575",
+"V c #717171",
+"W c #646464",
+"X c #6A6A6A",
+"Y c #CACACA",
+"Z c #404040",
+"` c #7D7D7D",
+" . c #7A7A7A",
+".. c #E6E6E6",
+"+. c #626262",
+"@. c #D3D3D3",
+"#. c #F1F1F1",
+"$. c #DDDDDD",
+"%. c #565656",
+"&. c #C5C5C5",
+"*. c #E7E7E7",
+"=. c #A9A9A9",
+"-. c #1C1C1C",
+";. c #454545",
+">. c #959595",
+",. c #B1B1B1",
+"'. c #D0D0D0",
+"). c #363636",
+"!. c #555555",
+"~. c #DEDEDE",
+"{. c #5B5B5B",
+"]. c #484848",
+"^. c #050505",
+"/. c #131313",
+"(. c #F7F7F7",
+"_. c #747474",
+":. c #393939",
+"<. c #888888",
+"[. c #606060",
+"}. c #3C3C3C",
+"|. c #DBDBDB",
+"1. c #797979",
+"2. c #DFDFDF",
+"3. c #AAAAAA",
+"4. c #A0A0A0",
+"5. c #C6C6C6",
+"6. c #3F3F3F",
+"7. c #4B4B4B",
+"8. c #B9B9B9",
+"9. c #CDCDCD",
+"0. c #6B6B6B",
+"a. c #B6B6B6",
+"b. c #BABABA",
+"c. c #252525",
+"d. c #8B8B8B",
+"e. c #EAEAEA",
+"f. c #4A4A4A",
+"g. c #9F9F9F",
+"h. c #8E8E8E",
+"i. c #F5F5F5",
+"j. c #8A8A8A",
+"k. c #E1E1E1",
+"l. c #BCBCBC",
+"m. c #E5E5E5",
+"n. c #A3A3A3",
+"o. c #CBCBCB",
+"p. c #EDEDED",
+"q. c #9A9A9A",
+"r. c #B4B4B4",
+" . + @ @ @ # $ % % ",
+" % & * = = - ; > , % % ",
+" % % % ' ) ! ~ % % % { ] ^ / ( _ % % % % % ",
+" % % : < [ } | 1 % % 2 3 4 5 6 7 8 9 % % % ",
+" % 0 a b ' % c 1 % % % { d e _ f 4 g h % ",
+" % i j k % l m n g o p q % % % % r s t % ",
+" % % u v w x % % y z A B ( z 0 % % % % % C D E ",
+" 9 F G H I J K % % % L M N % k O 1 1 1 1 ) P Q % ",
+" R S T U j V W % % X Y % z Z ` ` ` .m 0 B .. ",
+" ) 5 ..+.% @.o #.$.} %.% 9 + % .&. ",
+" ) 5 *.+.% =.# 6 -.;.% 9 + % >.,. ",
+" ) 5 % % ..+.% _ '.).m : + % 4 P ",
+" ) W f f f q ! % #.&.!.C f f ~.s k {.K ",
+" z G ].^./.o ^ % (._.+.:.].+.<.O [.k ",
+" % % 4 }.G * % % % % % & t % N [ |. ",
+" _ U , 0 % % * ; ` T T 1...% % % ! 2.( {.w % ",
+" % >.3.% % % ` 4.1 1 1 } 5.% 9 6.4.7.8.k % ",
+" % 9.0.% % % c 1 % % { a.2.b.5 c.d.e.% % ",
+" k f.z % % c 1 % % % { ].W b | u % ",
+" % % g.h.% % c 1 % % { 5.% $.@ (.% % ",
+" % i.o 9.% & Q j.j.j.| ~ L o F % % ",
+" k.7.~ k.l.l.l.l.l.m.! n.% ",
+" % C {.U o.z p.x q.7.r.% ",
+" % % : * U 7 M v g.E % % "};
xbill-2.1-score.patch:
--- NEW FILE xbill-2.1-score.patch ---
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1.score/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1.score/Scorelist.c 2008-12-27 15:06:14.000000000 +0100
@@ -83,13 +83,15 @@
void
Scorelist_update() {
char str[500];
+ char temp[40];
int i;
- sprintf(str, "%s\n\n", "High Scores:");
- sprintf(str, "%s%-*s %6s %7s\n", str, NAMELEN,
- "Name", "Level", "Score");
+ strcpy(str, "High Scores:\n\n");
+ sprintf(temp, "%-*s %6s %7s\n", NAMELEN, "Name", "Level", "Score");
+ strcat(str, temp);
for (i = 0; i < SCORES; i++) {
- sprintf(str, "%s%-*s %6d %7d\n", str, NAMELEN,
+ sprintf(temp, "%-*s %6d %7d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
+ strcat(str, temp);
}
UI_update_dialog(DIALOG_HIGHSCORE, str);
}
--- NEW FILE xbill.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xBill
Comment=Stop Bill from loading his OS into all the computers
Exec=xbill
Icon=xbill
Terminal=false
Type=Application
Categories=Game;ActionGame
--- NEW FILE xbill.spec ---
Name: xbill
Version: 2.1
Release: 2%{?dist}
Summary: Stop Bill from loading his OS into all the computers
Group: Amusements/Games
License: GPL+
URL: http://www.xbill.org/
Source0: http://www.xbill.org/download/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# Gentoo 201214
Patch0: %{name}-2.1-gtk2.patch
# Debian
Patch1: %{name}-2.1-hurd_logos.patch
# Andrea Musuruane
Patch2: %{name}-2.1-score.patch
Patch3: %{name}-2.1-dropsgid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
Requires: hicolor-icon-theme
%description
The xbill game tests your reflexes as you seek out and destroy all
forms of Bill, establish a new operating system throughout the
universe, and boldly go where no geek has gone before. Xbill has
become an increasingly attractive option as the Linux Age progresses,
and it is very popular at Red Hat.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
# Patch2 must be applied before patch3
%patch2 -p1
%patch3 -p1
%build
autoreconf
%configure --disable-motif \
--localstatedir=%{_localstatedir}/games
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#install man page
install -d %{buildroot}%_mandir/man6
install -m 644 %{name}.6 %{buildroot}%{_mandir}/man6
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
convert -resize x48 %{name}.gif \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%attr(2755,root,games) %{_bindir}/%{name}
%{_localstatedir}/games/%{name}
%attr(0664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}/scores
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%doc ChangeLog README
%changelog
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
* Sun Oct 28 2001 Brian Wellington <bwelling(a)xbill.org>
- Updated to 2.1
* Sun Jun 24 2001 Elliot Lee <sopwith(a)redhat.com>
- Bump release + rebuild.
* Fri Apr 27 2001 Bill Nottingham <notting(a)redhat.com>
- rebuild for C++ exception handling on ia64
* Wed Oct 18 2000 Than Ngo <than(a)redhat.com>
- rebuilt against gcc-2.96-60
* Tue Jul 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt with gcc-2.96-4.0
* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
- automatic rebuild
* Tue Jul 2 2000 Jakub Jelinek <jakub(a)redhat.com>
- Rebuild with new C++
* Sun Jun 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt in the new build environment
- use RPM maccros
* Mon May 08 2000 Preston Brown <pbrown(a)redhat.com>
- fix for gcc 2.95 from t-matsuu(a)protein.osaka-u.ac.jp.
* Mon Feb 07 2000 Preston Brown <pbrown(a)redhat.com>
- rebuild with config(noreplace) score file, new description
- replace wmconfig with desktop file
* Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com>
- auto rebuild in the new build environment (release 6)
* Thu Dec 17 1998 Michael Maher <mike(a)redhat.com>
- built pacakge for 6.0
* Fri May 01 1998 Prospector System <bugs(a)redhat.com>
- translations modified for de, fr, tr
* Fri Aug 22 1997 Erik Troan <ewt(a)redhat.com>
- built against glibc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbill/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2009 20:34:44 -0000 1.1
+++ .cvsignore 26 Feb 2009 18:40:10 -0000 1.2
@@ -0,0 +1 @@
+xbill-2.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbill/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 20:34:44 -0000 1.1
+++ sources 26 Feb 2009 18:40:10 -0000 1.2
@@ -0,0 +1 @@
+585e4866b15255a24203db9959407b2f xbill-2.1.tar.gz
15 years, 10 months
- 1
- 0
rpms/xbill/F-10 xbill-2.1-dropsgid.patch, NONE, 1.1 xbill-2.1-gtk2.patch, NONE, 1.1 xbill-2.1-hurd_logos.patch, NONE, 1.1 xbill-2.1-score.patch, NONE, 1.1 xbill.desktop, NONE, 1.1 xbill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xbill/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv942/F-10
Modified Files:
.cvsignore sources
Added Files:
xbill-2.1-dropsgid.patch xbill-2.1-gtk2.patch
xbill-2.1-hurd_logos.patch xbill-2.1-score.patch xbill.desktop
xbill.spec
Log Message:
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
xbill-2.1-dropsgid.patch:
--- NEW FILE xbill-2.1-dropsgid.patch ---
diff -dur xbill-2.1.orig/Game.c xbill-2.1/Game.c
--- xbill-2.1.orig/Game.c 2001-10-30 19:28:27.000000000 +0100
+++ xbill-2.1/Game.c 2008-12-26 10:08:56.000000000 +0100
@@ -304,6 +304,7 @@
int
main(int argc, char **argv) {
+ Scorelist_open();
srand(time(NULL));
parse_args(argc, argv);
UI_initialize(gui, &argc, argv);
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.c 2008-12-26 19:51:20.000000000 +0100
@@ -1,6 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "Scorelist.h"
#include "UI.h"
@@ -16,16 +18,33 @@
static Score scores[SCORES];
+FILE *scorefile;
+
+void
+Scorelist_open() {
+ gid_t realgid;
+
+ /* Open the scoreboard file. */
+ scorefile = fopen(SCOREFILE, "r+");
+
+ /* Figure out who we really are. */
+ realgid = getgid();
+
+ /* This is where we drop our setuid/setgid privileges. */
+ if (setresgid(-1, realgid, realgid) != 0) {
+ perror("Could not drop setgid privileges. Aborting.");
+ exit(1);
+ }
+}
+
void
Scorelist_read() {
- FILE *scorefile = fopen(SCOREFILE, "r");
int i;
if (scorefile != NULL) {
for (i = 0; i < SCORES; i++)
fscanf(scorefile, "%20s%d%d\n", scores[i].name,
&scores[i].level, &scores[i].score);
- fclose(scorefile);
}
else {
for (i = 0; i < SCORES; i++) {
@@ -38,10 +57,10 @@
void
Scorelist_write() {
- FILE *scorefile = fopen(SCOREFILE, "w");
int i;
if (scorefile == NULL)
return;
+ rewind(scorefile);
for (i = 0; i < SCORES; i++)
fprintf(scorefile, "%-*s %d %d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
diff -dur xbill-2.1.orig/Scorelist.h xbill-2.1/Scorelist.h
--- xbill-2.1.orig/Scorelist.h 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.h 2008-12-26 19:11:22.000000000 +0100
@@ -1,6 +1,7 @@
#ifndef SCORELIST_H
#define SCORELIST_H
+void Scorelist_open(void);
void Scorelist_read(void);
void Scorelist_write(void);
void Scorelist_recalc(const char *str, int level, int score);
xbill-2.1-gtk2.patch:
--- NEW FILE xbill-2.1-gtk2.patch ---
--- configure.in.old 2007-12-05 22:37:57.000000000 +0100
+++ configure.in 2007-12-05 22:54:57.000000000 +0100
@@ -88,12 +88,11 @@
[ --enable-gtk build with the GTK widget set])
if test "$enable_gtk" != "no"; then
- AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
- if test "X$GTKCONFIG" = X"yes"; then
+ if test $pkg_failed = no; then
AC_DEFINE(USE_GTK)
- GTK_CFLAGS="`gtk-config --cflags`"
- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
+ WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
WIDGET_OBJS="$WIDGET_OBJS gtk.o"
fi
fi
xbill-2.1-hurd_logos.patch:
--- NEW FILE xbill-2.1-hurd_logos.patch ---
--- xbill-2.1.orig/bitmaps/hurd.xbm
+++ xbill-2.1/bitmaps/hurd.xbm
@@ -1,10 +1,11 @@
#define hurd_width 28
#define hurd_height 24
-static char hurd_bits[] = {
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0xc4,0x22,0xef,0xf1,0xc4,0x22,0x2d,0xf3,0xc4,0x22,0x29,0xf3,0xc4,
- 0x22,0x2d,0xf2,0xfc,0x22,0x27,0xf2,0xc4,0x22,0x27,0xf2,0xc4,0x22,0x25,0xf3,
- 0xc4,0x36,0x2d,0xf3,0x04,0x1c,0xe9,0xf1,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0xf0};
+static unsigned char hurd_bits[] = {
+ 0x00, 0xfe, 0x00, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x00, 0xc7, 0x07, 0x00,
+ 0xc0, 0xc7, 0x1f, 0x00, 0x60, 0xc6, 0x79, 0x00, 0x30, 0xfe, 0xe0, 0x00,
+ 0x78, 0x7c, 0xc0, 0x01, 0xfc, 0x10, 0xfe, 0x01, 0xfe, 0x30, 0x7f, 0x03,
+ 0xc6, 0xb0, 0x43, 0x03, 0xc6, 0xe0, 0x43, 0x03, 0xc6, 0x80, 0x43, 0x03,
+ 0xfe, 0x00, 0x7f, 0x03, 0xfe, 0x00, 0xfe, 0x01, 0x78, 0x00, 0x98, 0x01,
+ 0x30, 0xfe, 0xf8, 0x00, 0x30, 0xfe, 0x78, 0x00, 0x30, 0xc6, 0x3f, 0x00,
+ 0x60, 0xc6, 0x0f, 0x00, 0x60, 0xc6, 0x06, 0x00, 0xc0, 0xfe, 0x06, 0x00,
+ 0xc0, 0xff, 0x03, 0x00, 0x80, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x00, 0x00 };
--- xbill-2.1.orig/pixmaps/hurd.xpm
+++ xbill-2.1/pixmaps/hurd.xpm
@@ -1,44 +1,176 @@
/* XPM */
static char * hurd_xpm[] = {
-"28 24 16 1",
-" c #aaaaaa",
-". c #71b6d6",
-"X c #5da4f1",
-"o c #5e91d7",
-"O c #3171c5",
-"+ c #3487ca",
-"@ c #2750a0",
-"# c #29d176",
-"$ c #77d8d9",
-"% c #21bf77",
-"& c #00ff00",
-"* c #10e13c",
-"= c #183571",
-"- c #16ef1a",
-"; c #25639c",
-": c #1f418a",
-/* pixels */
-" ",
-" ",
-" ",
-" .XXXo ",
-" XXXXXXOo ",
-" XXXXXXX+O ",
-" XXXXXXXX+O@ ",
-" # .#XX$#XX%%+@o### ",
-" & &&.&X$$&**&&&&=&&&&# ",
-" & &&.&$$$&**&O&&=& && ",
-" & &&.&$$$&**&O*&=& && ",
-" &---&&.&X$X&**&O&&=& & ",
-" &&&&&&.&XXX&**&&&-=& & ",
-" & &&.&XXX&%*&&&==& & ",
-" & &&X&*X%&+*&;&-;& && ",
-" & &&X&&%&&O*&@&&;&--&& ",
-" & --+%&&&+O*&:*&+&&&& ",
-" O+O+OO@@:=:O+ ",
-" oOOOO@@:==@$o ",
-" @@@@::==:XX ",
-" @::::==:@XX ",
-" ;=====:@o ",
-" @==:O ",
-" "};
+"28 24 149 2",
+" c #FFFFFF",
+". c #9C9C9C",
+"+ c #505050",
+"@ c #575757",
+"# c #464646",
+"$ c #D7D7D7",
+"% c #FEFEFE",
+"& c #7E7E7E",
+"* c #BDBDBD",
+"= c #EFEFEF",
+"- c #F0F0F0",
+"; c #7B7B7B",
+"> c #A5A5A5",
+", c #CCCCCC",
+"' c #F3F3F3",
+") c #D9D9D9",
+"! c #616161",
+"~ c #C8C8C8",
+"{ c #828282",
+"] c #161616",
+"^ c #9B9B9B",
+"/ c #D2D2D2",
+"( c #E8E8E8",
+"_ c #FBFBFB",
+": c #F8F8F8",
+"< c #979797",
+"[ c #535353",
+"} c #676767",
+"| c #474747",
+"1 c #C9C9C9",
+"2 c #818181",
+"3 c #111111",
+"4 c #808080",
+"5 c #6F6F6F",
+"6 c #5E5E5E",
+"7 c #595959",
+"8 c #ADADAD",
+"9 c #F9F9F9",
+"0 c #FCFCFC",
+"a c #707070",
+"b c #878787",
+"c c #7F7F7F",
+"d c #767676",
+"e c #BBBBBB",
+"f c #E4E4E4",
+"g c #515151",
+"h c #D4D4D4",
+"i c #B8B8B8",
+"j c #777777",
+"k c #FDFDFD",
+"l c #898989",
+"m c #4C4C4C",
+"n c #5A5A5A",
+"o c #5C5C5C",
+"p c #373737",
+"q c #CECECE",
+"r c #D5D5D5",
+"s c #4E4E4E",
+"t c #C4C4C4",
+"u c #BFBFBF",
+"v c #696969",
+"w c #AEAEAE",
+"x c #DADADA",
+"y c #F6F6F6",
+"z c #EBEBEB",
+"A c #D8D8D8",
+"B c #545454",
+"C c #E3E3E3",
+"D c #4D4D4D",
+"E c #E9E9E9",
+"F c #CFCFCF",
+"G c #6D6D6D",
+"H c #0D0D0D",
+"I c #242424",
+"J c #A4A4A4",
+"K c #E0E0E0",
+"L c #F4F4F4",
+"M c #585858",
+"N c #F2F2F2",
+"O c #D1D1D1",
+"P c #C0C0C0",
+"Q c #6E6E6E",
+"R c #DCDCDC",
+"S c #434343",
+"T c #7C7C7C",
+"U c #757575",
+"V c #717171",
+"W c #646464",
+"X c #6A6A6A",
+"Y c #CACACA",
+"Z c #404040",
+"` c #7D7D7D",
+" . c #7A7A7A",
+".. c #E6E6E6",
+"+. c #626262",
+"@. c #D3D3D3",
+"#. c #F1F1F1",
+"$. c #DDDDDD",
+"%. c #565656",
+"&. c #C5C5C5",
+"*. c #E7E7E7",
+"=. c #A9A9A9",
+"-. c #1C1C1C",
+";. c #454545",
+">. c #959595",
+",. c #B1B1B1",
+"'. c #D0D0D0",
+"). c #363636",
+"!. c #555555",
+"~. c #DEDEDE",
+"{. c #5B5B5B",
+"]. c #484848",
+"^. c #050505",
+"/. c #131313",
+"(. c #F7F7F7",
+"_. c #747474",
+":. c #393939",
+"<. c #888888",
+"[. c #606060",
+"}. c #3C3C3C",
+"|. c #DBDBDB",
+"1. c #797979",
+"2. c #DFDFDF",
+"3. c #AAAAAA",
+"4. c #A0A0A0",
+"5. c #C6C6C6",
+"6. c #3F3F3F",
+"7. c #4B4B4B",
+"8. c #B9B9B9",
+"9. c #CDCDCD",
+"0. c #6B6B6B",
+"a. c #B6B6B6",
+"b. c #BABABA",
+"c. c #252525",
+"d. c #8B8B8B",
+"e. c #EAEAEA",
+"f. c #4A4A4A",
+"g. c #9F9F9F",
+"h. c #8E8E8E",
+"i. c #F5F5F5",
+"j. c #8A8A8A",
+"k. c #E1E1E1",
+"l. c #BCBCBC",
+"m. c #E5E5E5",
+"n. c #A3A3A3",
+"o. c #CBCBCB",
+"p. c #EDEDED",
+"q. c #9A9A9A",
+"r. c #B4B4B4",
+" . + @ @ @ # $ % % ",
+" % & * = = - ; > , % % ",
+" % % % ' ) ! ~ % % % { ] ^ / ( _ % % % % % ",
+" % % : < [ } | 1 % % 2 3 4 5 6 7 8 9 % % % ",
+" % 0 a b ' % c 1 % % % { d e _ f 4 g h % ",
+" % i j k % l m n g o p q % % % % r s t % ",
+" % % u v w x % % y z A B ( z 0 % % % % % C D E ",
+" 9 F G H I J K % % % L M N % k O 1 1 1 1 ) P Q % ",
+" R S T U j V W % % X Y % z Z ` ` ` .m 0 B .. ",
+" ) 5 ..+.% @.o #.$.} %.% 9 + % .&. ",
+" ) 5 *.+.% =.# 6 -.;.% 9 + % >.,. ",
+" ) 5 % % ..+.% _ '.).m : + % 4 P ",
+" ) W f f f q ! % #.&.!.C f f ~.s k {.K ",
+" z G ].^./.o ^ % (._.+.:.].+.<.O [.k ",
+" % % 4 }.G * % % % % % & t % N [ |. ",
+" _ U , 0 % % * ; ` T T 1...% % % ! 2.( {.w % ",
+" % >.3.% % % ` 4.1 1 1 } 5.% 9 6.4.7.8.k % ",
+" % 9.0.% % % c 1 % % { a.2.b.5 c.d.e.% % ",
+" k f.z % % c 1 % % % { ].W b | u % ",
+" % % g.h.% % c 1 % % { 5.% $.@ (.% % ",
+" % i.o 9.% & Q j.j.j.| ~ L o F % % ",
+" k.7.~ k.l.l.l.l.l.m.! n.% ",
+" % C {.U o.z p.x q.7.r.% ",
+" % % : * U 7 M v g.E % % "};
xbill-2.1-score.patch:
--- NEW FILE xbill-2.1-score.patch ---
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1.score/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1.score/Scorelist.c 2008-12-27 15:06:14.000000000 +0100
@@ -83,13 +83,15 @@
void
Scorelist_update() {
char str[500];
+ char temp[40];
int i;
- sprintf(str, "%s\n\n", "High Scores:");
- sprintf(str, "%s%-*s %6s %7s\n", str, NAMELEN,
- "Name", "Level", "Score");
+ strcpy(str, "High Scores:\n\n");
+ sprintf(temp, "%-*s %6s %7s\n", NAMELEN, "Name", "Level", "Score");
+ strcat(str, temp);
for (i = 0; i < SCORES; i++) {
- sprintf(str, "%s%-*s %6d %7d\n", str, NAMELEN,
+ sprintf(temp, "%-*s %6d %7d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
+ strcat(str, temp);
}
UI_update_dialog(DIALOG_HIGHSCORE, str);
}
--- NEW FILE xbill.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xBill
Comment=Stop Bill from loading his OS into all the computers
Exec=xbill
Icon=xbill
Terminal=false
Type=Application
Categories=Game;ActionGame
--- NEW FILE xbill.spec ---
Name: xbill
Version: 2.1
Release: 2%{?dist}
Summary: Stop Bill from loading his OS into all the computers
Group: Amusements/Games
License: GPL+
URL: http://www.xbill.org/
Source0: http://www.xbill.org/download/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# Gentoo 201214
Patch0: %{name}-2.1-gtk2.patch
# Debian
Patch1: %{name}-2.1-hurd_logos.patch
# Andrea Musuruane
Patch2: %{name}-2.1-score.patch
Patch3: %{name}-2.1-dropsgid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
Requires: hicolor-icon-theme
%description
The xbill game tests your reflexes as you seek out and destroy all
forms of Bill, establish a new operating system throughout the
universe, and boldly go where no geek has gone before. Xbill has
become an increasingly attractive option as the Linux Age progresses,
and it is very popular at Red Hat.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
# Patch2 must be applied before patch3
%patch2 -p1
%patch3 -p1
%build
autoreconf
%configure --disable-motif \
--localstatedir=%{_localstatedir}/games
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#install man page
install -d %{buildroot}%_mandir/man6
install -m 644 %{name}.6 %{buildroot}%{_mandir}/man6
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
convert -resize x48 %{name}.gif \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%attr(2755,root,games) %{_bindir}/%{name}
%{_localstatedir}/games/%{name}
%attr(0664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}/scores
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%doc ChangeLog README
%changelog
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
* Sun Oct 28 2001 Brian Wellington <bwelling(a)xbill.org>
- Updated to 2.1
* Sun Jun 24 2001 Elliot Lee <sopwith(a)redhat.com>
- Bump release + rebuild.
* Fri Apr 27 2001 Bill Nottingham <notting(a)redhat.com>
- rebuild for C++ exception handling on ia64
* Wed Oct 18 2000 Than Ngo <than(a)redhat.com>
- rebuilt against gcc-2.96-60
* Tue Jul 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt with gcc-2.96-4.0
* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
- automatic rebuild
* Tue Jul 2 2000 Jakub Jelinek <jakub(a)redhat.com>
- Rebuild with new C++
* Sun Jun 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt in the new build environment
- use RPM maccros
* Mon May 08 2000 Preston Brown <pbrown(a)redhat.com>
- fix for gcc 2.95 from t-matsuu(a)protein.osaka-u.ac.jp.
* Mon Feb 07 2000 Preston Brown <pbrown(a)redhat.com>
- rebuild with config(noreplace) score file, new description
- replace wmconfig with desktop file
* Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com>
- auto rebuild in the new build environment (release 6)
* Thu Dec 17 1998 Michael Maher <mike(a)redhat.com>
- built pacakge for 6.0
* Fri May 01 1998 Prospector System <bugs(a)redhat.com>
- translations modified for de, fr, tr
* Fri Aug 22 1997 Erik Troan <ewt(a)redhat.com>
- built against glibc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbill/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2009 20:34:44 -0000 1.1
+++ .cvsignore 26 Feb 2009 18:39:12 -0000 1.2
@@ -0,0 +1 @@
+xbill-2.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbill/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 20:34:44 -0000 1.1
+++ sources 26 Feb 2009 18:39:12 -0000 1.2
@@ -0,0 +1 @@
+585e4866b15255a24203db9959407b2f xbill-2.1.tar.gz
15 years, 10 months
- 1
- 0
rpms/xbill/devel xbill-2.1-dropsgid.patch, NONE, 1.1 xbill-2.1-gtk2.patch, NONE, 1.1 xbill-2.1-hurd_logos.patch, NONE, 1.1 xbill-2.1-score.patch, NONE, 1.1 xbill.desktop, NONE, 1.1 xbill.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xbill/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv390/devel
Modified Files:
.cvsignore sources
Added Files:
xbill-2.1-dropsgid.patch xbill-2.1-gtk2.patch
xbill-2.1-hurd_logos.patch xbill-2.1-score.patch xbill.desktop
xbill.spec
Log Message:
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
xbill-2.1-dropsgid.patch:
--- NEW FILE xbill-2.1-dropsgid.patch ---
diff -dur xbill-2.1.orig/Game.c xbill-2.1/Game.c
--- xbill-2.1.orig/Game.c 2001-10-30 19:28:27.000000000 +0100
+++ xbill-2.1/Game.c 2008-12-26 10:08:56.000000000 +0100
@@ -304,6 +304,7 @@
int
main(int argc, char **argv) {
+ Scorelist_open();
srand(time(NULL));
parse_args(argc, argv);
UI_initialize(gui, &argc, argv);
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.c 2008-12-26 19:51:20.000000000 +0100
@@ -1,6 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
#include "Scorelist.h"
#include "UI.h"
@@ -16,16 +18,33 @@
static Score scores[SCORES];
+FILE *scorefile;
+
+void
+Scorelist_open() {
+ gid_t realgid;
+
+ /* Open the scoreboard file. */
+ scorefile = fopen(SCOREFILE, "r+");
+
+ /* Figure out who we really are. */
+ realgid = getgid();
+
+ /* This is where we drop our setuid/setgid privileges. */
+ if (setresgid(-1, realgid, realgid) != 0) {
+ perror("Could not drop setgid privileges. Aborting.");
+ exit(1);
+ }
+}
+
void
Scorelist_read() {
- FILE *scorefile = fopen(SCOREFILE, "r");
int i;
if (scorefile != NULL) {
for (i = 0; i < SCORES; i++)
fscanf(scorefile, "%20s%d%d\n", scores[i].name,
&scores[i].level, &scores[i].score);
- fclose(scorefile);
}
else {
for (i = 0; i < SCORES; i++) {
@@ -38,10 +57,10 @@
void
Scorelist_write() {
- FILE *scorefile = fopen(SCOREFILE, "w");
int i;
if (scorefile == NULL)
return;
+ rewind(scorefile);
for (i = 0; i < SCORES; i++)
fprintf(scorefile, "%-*s %d %d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
diff -dur xbill-2.1.orig/Scorelist.h xbill-2.1/Scorelist.h
--- xbill-2.1.orig/Scorelist.h 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1/Scorelist.h 2008-12-26 19:11:22.000000000 +0100
@@ -1,6 +1,7 @@
#ifndef SCORELIST_H
#define SCORELIST_H
+void Scorelist_open(void);
void Scorelist_read(void);
void Scorelist_write(void);
void Scorelist_recalc(const char *str, int level, int score);
xbill-2.1-gtk2.patch:
--- NEW FILE xbill-2.1-gtk2.patch ---
--- configure.in.old 2007-12-05 22:37:57.000000000 +0100
+++ configure.in 2007-12-05 22:54:57.000000000 +0100
@@ -88,12 +88,11 @@
[ --enable-gtk build with the GTK widget set])
if test "$enable_gtk" != "no"; then
- AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0)
- if test "X$GTKCONFIG" = X"yes"; then
+ if test $pkg_failed = no; then
AC_DEFINE(USE_GTK)
- GTK_CFLAGS="`gtk-config --cflags`"
- WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
+ WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
WIDGET_OBJS="$WIDGET_OBJS gtk.o"
fi
fi
xbill-2.1-hurd_logos.patch:
--- NEW FILE xbill-2.1-hurd_logos.patch ---
--- xbill-2.1.orig/bitmaps/hurd.xbm
+++ xbill-2.1/bitmaps/hurd.xbm
@@ -1,10 +1,11 @@
#define hurd_width 28
#define hurd_height 24
-static char hurd_bits[] = {
- 0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0xc4,0x22,0xef,0xf1,0xc4,0x22,0x2d,0xf3,0xc4,0x22,0x29,0xf3,0xc4,
- 0x22,0x2d,0xf2,0xfc,0x22,0x27,0xf2,0xc4,0x22,0x27,0xf2,0xc4,0x22,0x25,0xf3,
- 0xc4,0x36,0x2d,0xf3,0x04,0x1c,0xe9,0xf1,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,
- 0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,0x00,0xf0,0x00,0x00,
- 0x00,0xf0,0x00,0x00,0x00,0xf0};
+static unsigned char hurd_bits[] = {
+ 0x00, 0xfe, 0x00, 0x00, 0x00, 0xc6, 0x01, 0x00, 0x00, 0xc7, 0x07, 0x00,
+ 0xc0, 0xc7, 0x1f, 0x00, 0x60, 0xc6, 0x79, 0x00, 0x30, 0xfe, 0xe0, 0x00,
+ 0x78, 0x7c, 0xc0, 0x01, 0xfc, 0x10, 0xfe, 0x01, 0xfe, 0x30, 0x7f, 0x03,
+ 0xc6, 0xb0, 0x43, 0x03, 0xc6, 0xe0, 0x43, 0x03, 0xc6, 0x80, 0x43, 0x03,
+ 0xfe, 0x00, 0x7f, 0x03, 0xfe, 0x00, 0xfe, 0x01, 0x78, 0x00, 0x98, 0x01,
+ 0x30, 0xfe, 0xf8, 0x00, 0x30, 0xfe, 0x78, 0x00, 0x30, 0xc6, 0x3f, 0x00,
+ 0x60, 0xc6, 0x0f, 0x00, 0x60, 0xc6, 0x06, 0x00, 0xc0, 0xfe, 0x06, 0x00,
+ 0xc0, 0xff, 0x03, 0x00, 0x80, 0xff, 0x01, 0x00, 0x00, 0xfe, 0x00, 0x00 };
--- xbill-2.1.orig/pixmaps/hurd.xpm
+++ xbill-2.1/pixmaps/hurd.xpm
@@ -1,44 +1,176 @@
/* XPM */
static char * hurd_xpm[] = {
-"28 24 16 1",
-" c #aaaaaa",
-". c #71b6d6",
-"X c #5da4f1",
-"o c #5e91d7",
-"O c #3171c5",
-"+ c #3487ca",
-"@ c #2750a0",
-"# c #29d176",
-"$ c #77d8d9",
-"% c #21bf77",
-"& c #00ff00",
-"* c #10e13c",
-"= c #183571",
-"- c #16ef1a",
-"; c #25639c",
-": c #1f418a",
-/* pixels */
-" ",
-" ",
-" ",
-" .XXXo ",
-" XXXXXXOo ",
-" XXXXXXX+O ",
-" XXXXXXXX+O@ ",
-" # .#XX$#XX%%+@o### ",
-" & &&.&X$$&**&&&&=&&&&# ",
-" & &&.&$$$&**&O&&=& && ",
-" & &&.&$$$&**&O*&=& && ",
-" &---&&.&X$X&**&O&&=& & ",
-" &&&&&&.&XXX&**&&&-=& & ",
-" & &&.&XXX&%*&&&==& & ",
-" & &&X&*X%&+*&;&-;& && ",
-" & &&X&&%&&O*&@&&;&--&& ",
-" & --+%&&&+O*&:*&+&&&& ",
-" O+O+OO@@:=:O+ ",
-" oOOOO@@:==@$o ",
-" @@@@::==:XX ",
-" @::::==:@XX ",
-" ;=====:@o ",
-" @==:O ",
-" "};
+"28 24 149 2",
+" c #FFFFFF",
+". c #9C9C9C",
+"+ c #505050",
+"@ c #575757",
+"# c #464646",
+"$ c #D7D7D7",
+"% c #FEFEFE",
+"& c #7E7E7E",
+"* c #BDBDBD",
+"= c #EFEFEF",
+"- c #F0F0F0",
+"; c #7B7B7B",
+"> c #A5A5A5",
+", c #CCCCCC",
+"' c #F3F3F3",
+") c #D9D9D9",
+"! c #616161",
+"~ c #C8C8C8",
+"{ c #828282",
+"] c #161616",
+"^ c #9B9B9B",
+"/ c #D2D2D2",
+"( c #E8E8E8",
+"_ c #FBFBFB",
+": c #F8F8F8",
+"< c #979797",
+"[ c #535353",
+"} c #676767",
+"| c #474747",
+"1 c #C9C9C9",
+"2 c #818181",
+"3 c #111111",
+"4 c #808080",
+"5 c #6F6F6F",
+"6 c #5E5E5E",
+"7 c #595959",
+"8 c #ADADAD",
+"9 c #F9F9F9",
+"0 c #FCFCFC",
+"a c #707070",
+"b c #878787",
+"c c #7F7F7F",
+"d c #767676",
+"e c #BBBBBB",
+"f c #E4E4E4",
+"g c #515151",
+"h c #D4D4D4",
+"i c #B8B8B8",
+"j c #777777",
+"k c #FDFDFD",
+"l c #898989",
+"m c #4C4C4C",
+"n c #5A5A5A",
+"o c #5C5C5C",
+"p c #373737",
+"q c #CECECE",
+"r c #D5D5D5",
+"s c #4E4E4E",
+"t c #C4C4C4",
+"u c #BFBFBF",
+"v c #696969",
+"w c #AEAEAE",
+"x c #DADADA",
+"y c #F6F6F6",
+"z c #EBEBEB",
+"A c #D8D8D8",
+"B c #545454",
+"C c #E3E3E3",
+"D c #4D4D4D",
+"E c #E9E9E9",
+"F c #CFCFCF",
+"G c #6D6D6D",
+"H c #0D0D0D",
+"I c #242424",
+"J c #A4A4A4",
+"K c #E0E0E0",
+"L c #F4F4F4",
+"M c #585858",
+"N c #F2F2F2",
+"O c #D1D1D1",
+"P c #C0C0C0",
+"Q c #6E6E6E",
+"R c #DCDCDC",
+"S c #434343",
+"T c #7C7C7C",
+"U c #757575",
+"V c #717171",
+"W c #646464",
+"X c #6A6A6A",
+"Y c #CACACA",
+"Z c #404040",
+"` c #7D7D7D",
+" . c #7A7A7A",
+".. c #E6E6E6",
+"+. c #626262",
+"@. c #D3D3D3",
+"#. c #F1F1F1",
+"$. c #DDDDDD",
+"%. c #565656",
+"&. c #C5C5C5",
+"*. c #E7E7E7",
+"=. c #A9A9A9",
+"-. c #1C1C1C",
+";. c #454545",
+">. c #959595",
+",. c #B1B1B1",
+"'. c #D0D0D0",
+"). c #363636",
+"!. c #555555",
+"~. c #DEDEDE",
+"{. c #5B5B5B",
+"]. c #484848",
+"^. c #050505",
+"/. c #131313",
+"(. c #F7F7F7",
+"_. c #747474",
+":. c #393939",
+"<. c #888888",
+"[. c #606060",
+"}. c #3C3C3C",
+"|. c #DBDBDB",
+"1. c #797979",
+"2. c #DFDFDF",
+"3. c #AAAAAA",
+"4. c #A0A0A0",
+"5. c #C6C6C6",
+"6. c #3F3F3F",
+"7. c #4B4B4B",
+"8. c #B9B9B9",
+"9. c #CDCDCD",
+"0. c #6B6B6B",
+"a. c #B6B6B6",
+"b. c #BABABA",
+"c. c #252525",
+"d. c #8B8B8B",
+"e. c #EAEAEA",
+"f. c #4A4A4A",
+"g. c #9F9F9F",
+"h. c #8E8E8E",
+"i. c #F5F5F5",
+"j. c #8A8A8A",
+"k. c #E1E1E1",
+"l. c #BCBCBC",
+"m. c #E5E5E5",
+"n. c #A3A3A3",
+"o. c #CBCBCB",
+"p. c #EDEDED",
+"q. c #9A9A9A",
+"r. c #B4B4B4",
+" . + @ @ @ # $ % % ",
+" % & * = = - ; > , % % ",
+" % % % ' ) ! ~ % % % { ] ^ / ( _ % % % % % ",
+" % % : < [ } | 1 % % 2 3 4 5 6 7 8 9 % % % ",
+" % 0 a b ' % c 1 % % % { d e _ f 4 g h % ",
+" % i j k % l m n g o p q % % % % r s t % ",
+" % % u v w x % % y z A B ( z 0 % % % % % C D E ",
+" 9 F G H I J K % % % L M N % k O 1 1 1 1 ) P Q % ",
+" R S T U j V W % % X Y % z Z ` ` ` .m 0 B .. ",
+" ) 5 ..+.% @.o #.$.} %.% 9 + % .&. ",
+" ) 5 *.+.% =.# 6 -.;.% 9 + % >.,. ",
+" ) 5 % % ..+.% _ '.).m : + % 4 P ",
+" ) W f f f q ! % #.&.!.C f f ~.s k {.K ",
+" z G ].^./.o ^ % (._.+.:.].+.<.O [.k ",
+" % % 4 }.G * % % % % % & t % N [ |. ",
+" _ U , 0 % % * ; ` T T 1...% % % ! 2.( {.w % ",
+" % >.3.% % % ` 4.1 1 1 } 5.% 9 6.4.7.8.k % ",
+" % 9.0.% % % c 1 % % { a.2.b.5 c.d.e.% % ",
+" k f.z % % c 1 % % % { ].W b | u % ",
+" % % g.h.% % c 1 % % { 5.% $.@ (.% % ",
+" % i.o 9.% & Q j.j.j.| ~ L o F % % ",
+" k.7.~ k.l.l.l.l.l.m.! n.% ",
+" % C {.U o.z p.x q.7.r.% ",
+" % % : * U 7 M v g.E % % "};
xbill-2.1-score.patch:
--- NEW FILE xbill-2.1-score.patch ---
diff -dur xbill-2.1.orig/Scorelist.c xbill-2.1.score/Scorelist.c
--- xbill-2.1.orig/Scorelist.c 2001-10-21 10:39:47.000000000 +0200
+++ xbill-2.1.score/Scorelist.c 2008-12-27 15:06:14.000000000 +0100
@@ -83,13 +83,15 @@
void
Scorelist_update() {
char str[500];
+ char temp[40];
int i;
- sprintf(str, "%s\n\n", "High Scores:");
- sprintf(str, "%s%-*s %6s %7s\n", str, NAMELEN,
- "Name", "Level", "Score");
+ strcpy(str, "High Scores:\n\n");
+ sprintf(temp, "%-*s %6s %7s\n", NAMELEN, "Name", "Level", "Score");
+ strcat(str, temp);
for (i = 0; i < SCORES; i++) {
- sprintf(str, "%s%-*s %6d %7d\n", str, NAMELEN,
+ sprintf(temp, "%-*s %6d %7d\n", NAMELEN,
scores[i].name, scores[i].level, scores[i].score);
+ strcat(str, temp);
}
UI_update_dialog(DIALOG_HIGHSCORE, str);
}
--- NEW FILE xbill.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xBill
Comment=Stop Bill from loading his OS into all the computers
Exec=xbill
Icon=xbill
Terminal=false
Type=Application
Categories=Game;ActionGame
--- NEW FILE xbill.spec ---
Name: xbill
Version: 2.1
Release: 2%{?dist}
Summary: Stop Bill from loading his OS into all the computers
Group: Amusements/Games
License: GPL+
URL: http://www.xbill.org/
Source0: http://www.xbill.org/download/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
# Gentoo 201214
Patch0: %{name}-2.1-gtk2.patch
# Debian
Patch1: %{name}-2.1-hurd_logos.patch
# Andrea Musuruane
Patch2: %{name}-2.1-score.patch
Patch3: %{name}-2.1-dropsgid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
Requires: hicolor-icon-theme
%description
The xbill game tests your reflexes as you seek out and destroy all
forms of Bill, establish a new operating system throughout the
universe, and boldly go where no geek has gone before. Xbill has
become an increasingly attractive option as the Linux Age progresses,
and it is very popular at Red Hat.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
# Patch2 must be applied before patch3
%patch2 -p1
%patch3 -p1
%build
autoreconf
%configure --disable-motif \
--localstatedir=%{_localstatedir}/games
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
#install man page
install -d %{buildroot}%_mandir/man6
install -m 644 %{name}.6 %{buildroot}%{_mandir}/man6
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
# install icon
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
convert -resize x48 %{name}.gif \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%attr(2755,root,games) %{_bindir}/%{name}
%{_localstatedir}/games/%{name}
%attr(0664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}/scores
%{_datadir}/%{name}
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%doc ChangeLog README
%changelog
* Thu Feb 26 2009 Andrea Musuruane <musuruan(a)gmail.com> 2.1-2
- Updated icon cache scriptlets to be compliant to new guidelines
* Sat Dec 27 2008 Andrea Musuruane <musuruan(a)gmail.com> 2.1-1
- Reworked to meet Fedora guidelines
- Used a patch to use gtk-2 (Gentoo BZ #201214)
- Used a patch to use an updated hurd logo (Debian)
- Made a patch to fix highscore view when compiling with FORTIFY_SOURCE=2
- Made a patch to drop setgid privileges after opening the score file
* Sun Oct 28 2001 Brian Wellington <bwelling(a)xbill.org>
- Updated to 2.1
* Sun Jun 24 2001 Elliot Lee <sopwith(a)redhat.com>
- Bump release + rebuild.
* Fri Apr 27 2001 Bill Nottingham <notting(a)redhat.com>
- rebuild for C++ exception handling on ia64
* Wed Oct 18 2000 Than Ngo <than(a)redhat.com>
- rebuilt against gcc-2.96-60
* Tue Jul 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt with gcc-2.96-4.0
* Thu Jul 13 2000 Prospector <bugzilla(a)redhat.com>
- automatic rebuild
* Tue Jul 2 2000 Jakub Jelinek <jakub(a)redhat.com>
- Rebuild with new C++
* Sun Jun 18 2000 Than Ngo <than(a)redhat.de>
- rebuilt in the new build environment
- use RPM maccros
* Mon May 08 2000 Preston Brown <pbrown(a)redhat.com>
- fix for gcc 2.95 from t-matsuu(a)protein.osaka-u.ac.jp.
* Mon Feb 07 2000 Preston Brown <pbrown(a)redhat.com>
- rebuild with config(noreplace) score file, new description
- replace wmconfig with desktop file
* Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com>
- auto rebuild in the new build environment (release 6)
* Thu Dec 17 1998 Michael Maher <mike(a)redhat.com>
- built pacakge for 6.0
* Fri May 01 1998 Prospector System <bugs(a)redhat.com>
- translations modified for de, fr, tr
* Fri Aug 22 1997 Erik Troan <ewt(a)redhat.com>
- built against glibc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbill/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Feb 2009 20:34:44 -0000 1.1
+++ .cvsignore 26 Feb 2009 18:38:11 -0000 1.2
@@ -0,0 +1 @@
+xbill-2.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbill/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Feb 2009 20:34:44 -0000 1.1
+++ sources 26 Feb 2009 18:38:11 -0000 1.2
@@ -0,0 +1 @@
+585e4866b15255a24203db9959407b2f xbill-2.1.tar.gz
15 years, 10 months
- 1
- 0
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.34,1.35
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27808
Modified Files:
nvidia-kmod.spec
Log Message:
move the obsolete parameters to the right place
15 years, 10 months
- 1
- 0
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.33,1.34
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27178
Modified Files:
nvidia-kmod.spec
Log Message:
- Handle Obsoletes/Provides in nvidia-kmod for nvidia-beta-kmod
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- nvidia-kmod.spec 25 Feb 2009 12:44:00 -0000 1.33
+++ nvidia-kmod.spec 26 Feb 2009 16:56:08 -0000 1.34
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels akmod
Name: nvidia-kmod
Version: 180.35
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -33,7 +33,7 @@
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels --obsolete-name nvidia-beta --obsolete-version "180.35" "%{?kernels}"} 2>/dev/null) }
%description
The nvidia %{version} display driver kernel module for kernel %{kversion}.
@@ -93,6 +93,9 @@
%changelog
+* Thu Feb 26 2009 kwizart < kwizart at gmail.com > - 180.35-2
+- Handle Obsoletes/Provides in nvidia-kmod for nvidia-beta-kmod
+
* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 180.35-1
- Update to 180.35 (stable)
15 years, 10 months
- 1
- 0