rpms/open-vm-tools-kmod/devel open-vm-tools-kmod.spec,1.54,1.55
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/open-vm-tools-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20399
Modified Files:
open-vm-tools-kmod.spec
Log Message:
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0.301124-2.5
- Rebuild for UsrMove
Index: open-vm-tools-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/devel/open-vm-tools-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- open-vm-tools-kmod.spec 2 Nov 2011 22:43:54 -0000 1.54
+++ open-vm-tools-kmod.spec 7 Feb 2012 21:58:24 -0000 1.55
@@ -13,7 +13,7 @@
Name: open-vm-tools-kmod
Version: 0.0.0.%{buildver}
-Release: 2%{?dist}.4
+Release: 2%{?dist}.5
Summary: VMware Tools Kernel Modules
Group: System Environment/Kernel
License: GPLv2
@@ -76,6 +76,9 @@
%changelog
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0.301124-2.5
+- Rebuild for UsrMove
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0.301124-2.4
- Rebuild for F-16 kernel
12 years, 9 months
rpms/openafs-kmod/devel openafs-kmod.spec,1.14,1.15
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20278
Modified Files:
openafs-kmod.spec
Log Message:
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-0.pre1.1
- Rebuild for UsrMove
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openafs-kmod.spec 6 Jan 2012 22:10:41 -0000 1.14
+++ openafs-kmod.spec 7 Feb 2012 21:58:16 -0000 1.15
@@ -1,7 +1,7 @@
# (un)define the next line to either build for the newest or all current kernels
-#define buildforkernels newest
-#define buildforkernels current
-%define buildforkernels akmod
+%define buildforkernels current
+%define buildforkernels current
+%define buildforkernels current
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -25,7 +25,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.1
-Release: 0.%{pre}%{?dist}
+Release: 0.%{pre}%{?dist}.1
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.1-0.pre1.1
+- Rebuild for UsrMove
+
* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
12 years, 9 months
rpms/omnibook-kmod/devel omnibook-kmod.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/omnibook-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20151
Modified Files:
omnibook-kmod.spec
Log Message:
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.20090714-0.6.svn288.5
- Rebuild for UsrMove
Index: omnibook-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/omnibook-kmod/devel/omnibook-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- omnibook-kmod.spec 25 Jan 2012 13:01:00 -0000 1.11
+++ omnibook-kmod.spec 7 Feb 2012 21:58:08 -0000 1.12
@@ -7,7 +7,7 @@
Name: omnibook-kmod
Version: 2.20090714
-Release: 0.6.svn288%{?dist}.4
+Release: 0.6.svn288%{?dist}.5
Summary: Kernel module for HP Omnibook/Pavillon, Toshiba Satellite and Compal laptops
Group: System Environment/Kernel
@@ -84,6 +84,9 @@
%changelog
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.20090714-0.6.svn288.5
+- Rebuild for UsrMove
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.20090714-0.6.svn288.4
- Rebuild for F-16 kernel
12 years, 9 months
rpms/ndiswrapper-kmod/devel ndiswrapper-kmod.spec,1.52,1.53
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20019
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.1
- Rebuild for UsrMove
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/devel/ndiswrapper-kmod.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ndiswrapper-kmod.spec 11 Jan 2012 21:20:28 -0000 1.52
+++ ndiswrapper-kmod.spec 7 Feb 2012 21:57:58 -0000 1.53
@@ -3,14 +3,14 @@
# "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 akmod
+%define buildforkernels current
#global _rc rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.57
-Release: 1%{?_rc}%{?dist}
+Release: 1%{?_rc}%{?dist}.1
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1.1
+- Rebuild for UsrMove
+
* Wed Jan 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.57-1
- Update to 1.57
12 years, 9 months
rpms/mess/F-15 mess-systemlibs.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 mess.spec, 1.8, 1.9 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6213
Modified Files:
.cvsignore mess.spec sources
Added Files:
mess-systemlibs.patch
Log Message:
* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
- Updated to 0.145
- Patched to use system libflac, libjpeg needs more work
- dat2html is no more
- Added floptool to the -tools sub-package
mess-systemlibs.patch:
makefile | 31 ++++++++++++++++++++++++++-----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 8 deletions(-)
--- NEW FILE mess-systemlibs.patch ---
diff -up mess-0.145/makefile.systemlibs mess-0.145/makefile
--- mess-0.145/makefile.systemlibs 2012-02-07 20:16:08.845116674 +0100
+++ mess-0.145/makefile 2012-02-07 20:16:08.849116700 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,9 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a
-# $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mess-0.145/src/emu/sound/samples.c.systemlibs mess-0.145/src/emu/sound/samples.c
--- mess-0.145/src/emu/sound/samples.c.systemlibs 2012-02-07 20:15:32.260892239 +0100
+++ mess-0.145/src/emu/sound/samples.c 2012-02-07 20:16:08.850116706 +0100
@@ -16,7 +16,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mess-0.145/src/lib/util/chd.c.systemlibs mess-0.145/src/lib/util/chd.c
--- mess-0.145/src/lib/util/chd.c.systemlibs 2012-02-07 20:15:23.800840438 +0100
+++ mess-0.145/src/lib/util/chd.c 2012-02-07 20:16:08.854116730 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mess-0.145/src/mame/drivers/sliver.c.systemlibs mess-0.145/src/mame/drivers/sliver.c
--- mess-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-07 20:15:57.226045319 +0100
+++ mess-0.145/src/mame/drivers/sliver.c 2012-02-07 20:16:08.856116742 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 15 Nov 2011 11:58:33 -0000 1.8
+++ .cvsignore 7 Feb 2012 19:58:23 -0000 1.9
@@ -1,3 +1,2 @@
ctrlr.rar
-mess0143s.zip
-mess0144s.zip
+mess0145s.zip
Index: mess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/mess.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mess.spec 15 Nov 2011 11:58:33 -0000 1.8
+++ mess.spec 7 Feb 2012 19:58:23 -0000 1.9
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 144
+%global baseversion 145
%global snapshot 0
Name: mess
@@ -22,10 +22,13 @@
Source1: ctrlr.rar
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
+Patch2: %{name}-systemlibs.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: SDL_ttf-devel
BuildRequires: unrar
BuildRequires: zlib-devel
@@ -76,6 +79,7 @@
%endif
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
+%patch2 -p1 -b .systemlibs
# Remove windows-specific documentation
rm -fr docs/win*
@@ -121,11 +125,13 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 TARGET=mess \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=mess\
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -159,7 +165,7 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 castool dat2html imgtool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 castool floptool imgtool $RPM_BUILD_ROOT%{_bindir}
install -pm 644 sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
@@ -192,7 +198,7 @@
%files tools
%doc imgtool.txt
%{_bindir}/castool
-%{_bindir}/dat2html
+%{_bindir}/floptool
%{_bindir}/imgtool
%files data
@@ -203,6 +209,12 @@
%changelog
+* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
+- Updated to 0.145
+- Patched to use system libflac, libjpeg needs more work
+- dat2html is no more
+- Added floptool to the -tools sub-package
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Updated the Source0 URL comment
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-15/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 15 Nov 2011 11:58:34 -0000 1.8
+++ sources 7 Feb 2012 19:58:23 -0000 1.9
@@ -1,2 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-af4821f2575c7d8a241bc8e1243c3b20 mess0144s.zip
+3beb88328d0627b21e6e122572526110 mess0145s.zip
12 years, 9 months
rpms/mess/F-16 mess-systemlibs.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 mess.spec, 1.8, 1.9 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6125
Modified Files:
.cvsignore mess.spec sources
Added Files:
mess-systemlibs.patch
Log Message:
* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
- Updated to 0.145
- Patched to use system libflac, libjpeg needs more work
- dat2html is no more
- Added floptool to the -tools sub-package
mess-systemlibs.patch:
makefile | 31 ++++++++++++++++++++++++++-----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 8 deletions(-)
--- NEW FILE mess-systemlibs.patch ---
diff -up mess-0.145/makefile.systemlibs mess-0.145/makefile
--- mess-0.145/makefile.systemlibs 2012-02-07 20:16:08.845116674 +0100
+++ mess-0.145/makefile 2012-02-07 20:16:08.849116700 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,9 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a
-# $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mess-0.145/src/emu/sound/samples.c.systemlibs mess-0.145/src/emu/sound/samples.c
--- mess-0.145/src/emu/sound/samples.c.systemlibs 2012-02-07 20:15:32.260892239 +0100
+++ mess-0.145/src/emu/sound/samples.c 2012-02-07 20:16:08.850116706 +0100
@@ -16,7 +16,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mess-0.145/src/lib/util/chd.c.systemlibs mess-0.145/src/lib/util/chd.c
--- mess-0.145/src/lib/util/chd.c.systemlibs 2012-02-07 20:15:23.800840438 +0100
+++ mess-0.145/src/lib/util/chd.c 2012-02-07 20:16:08.854116730 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mess-0.145/src/mame/drivers/sliver.c.systemlibs mess-0.145/src/mame/drivers/sliver.c
--- mess-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-07 20:15:57.226045319 +0100
+++ mess-0.145/src/mame/drivers/sliver.c 2012-02-07 20:16:08.856116742 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 15 Nov 2011 11:58:24 -0000 1.8
+++ .cvsignore 7 Feb 2012 19:58:14 -0000 1.9
@@ -1,3 +1,2 @@
ctrlr.rar
-mess0143s.zip
-mess0144s.zip
+mess0145s.zip
Index: mess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-16/mess.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mess.spec 15 Nov 2011 11:58:24 -0000 1.8
+++ mess.spec 7 Feb 2012 19:58:14 -0000 1.9
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 144
+%global baseversion 145
%global snapshot 0
Name: mess
@@ -22,10 +22,13 @@
Source1: ctrlr.rar
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
+Patch2: %{name}-systemlibs.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: SDL_ttf-devel
BuildRequires: unrar
BuildRequires: zlib-devel
@@ -76,6 +79,7 @@
%endif
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
+%patch2 -p1 -b .systemlibs
# Remove windows-specific documentation
rm -fr docs/win*
@@ -121,11 +125,13 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 TARGET=mess \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=mess\
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -159,7 +165,7 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 castool dat2html imgtool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 castool floptool imgtool $RPM_BUILD_ROOT%{_bindir}
install -pm 644 sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
@@ -192,7 +198,7 @@
%files tools
%doc imgtool.txt
%{_bindir}/castool
-%{_bindir}/dat2html
+%{_bindir}/floptool
%{_bindir}/imgtool
%files data
@@ -203,6 +209,12 @@
%changelog
+* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
+- Updated to 0.145
+- Patched to use system libflac, libjpeg needs more work
+- dat2html is no more
+- Added floptool to the -tools sub-package
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Updated the Source0 URL comment
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 15 Nov 2011 11:58:24 -0000 1.8
+++ sources 7 Feb 2012 19:58:14 -0000 1.9
@@ -1,2 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-af4821f2575c7d8a241bc8e1243c3b20 mess0144s.zip
+3beb88328d0627b21e6e122572526110 mess0145s.zip
12 years, 9 months
rpms/mess/devel mess-systemlibs.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 mess.spec, 1.8, 1.9 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6009
Modified Files:
.cvsignore mess.spec sources
Added Files:
mess-systemlibs.patch
Log Message:
* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
- Updated to 0.145
- Patched to use system libflac, libjpeg needs more work
- dat2html is no more
- Added floptool to the -tools sub-package
mess-systemlibs.patch:
makefile | 31 ++++++++++++++++++++++++++-----
src/emu/sound/samples.c | 6 +++++-
src/lib/util/chd.c | 6 +++++-
src/mame/drivers/sliver.c | 2 +-
4 files changed, 37 insertions(+), 8 deletions(-)
--- NEW FILE mess-systemlibs.patch ---
diff -up mess-0.145/makefile.systemlibs mess-0.145/makefile
--- mess-0.145/makefile.systemlibs 2012-02-07 20:16:08.845116674 +0100
+++ mess-0.145/makefile 2012-02-07 20:16:08.849116700 +0100
@@ -211,6 +211,12 @@ BUILD_EXPAT = 1
# uncomment next line to build zlib as part of MAME build
BUILD_ZLIB = 1
+# uncomment next line to build libjpeg as part of MAME build
+BUILD_JPEG = 1
+
+# uncomment next line to build libflac as part of MAME build
+BUILD_FLAC = 1
+
# uncomment next line to include the symbols
# SYMBOLS = 1
@@ -411,7 +417,9 @@ DEFS += -DUSE_NETWORK
endif
# need to ensure FLAC functions are statically linked
+ifeq ($(BUILD_FLAC),1)
DEFS += -DFLAC__NO_DLL
+endif
@@ -622,14 +630,30 @@ LIBS += -lz
ZLIB =
endif
+# add jpeg library
+ifeq ($(BUILD_JPEG),1)
+INCPATH += -I$(SRC)/lib/libjpeg
+JPEG_LIB = $(OBJ)/libjpeg.a
+else
+LIBS += -ljpeg
+JPEG_LIB =
+endif
+
+# add flac library
+ifeq ($(BUILD_FLAC),1)
+INCPATH += -I$(SRC)/lib/libflac/include
+FLAC_LIB = $(OBJ)/libflac.a $(OBJ)/libflac++.a
+else
+LIBS += -lFLAC -lFLAC++
+FLAC_LIB =
+endif
+
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
# add formats emulation library
FORMATS_LIB = $(OBJ)/libformats.a
-JPEG_LIB = $(OBJ)/libjpeg.a
-
#-------------------------------------------------
# 'default' target needs to go here, before the
# include files which define additional targets
@@ -639,9 +663,6 @@ default: maketree buildtools emulator
all: default tools
-FLAC_LIB = $(OBJ)/libflac.a
-# $(OBJ)/libflac++.a
-
#-------------------------------------------------
# defines needed by multiple make files
diff -up mess-0.145/src/emu/sound/samples.c.systemlibs mess-0.145/src/emu/sound/samples.c
--- mess-0.145/src/emu/sound/samples.c.systemlibs 2012-02-07 20:15:32.260892239 +0100
+++ mess-0.145/src/emu/sound/samples.c 2012-02-07 20:16:08.850116706 +0100
@@ -16,7 +16,11 @@
#include "emu.h"
#include "emuopts.h"
#include "samples.h"
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
typedef struct _sample_channel sample_channel;
struct _sample_channel
diff -up mess-0.145/src/lib/util/chd.c.systemlibs mess-0.145/src/lib/util/chd.c
--- mess-0.145/src/lib/util/chd.c.systemlibs 2012-02-07 20:15:23.800840438 +0100
+++ mess-0.145/src/lib/util/chd.c 2012-02-07 20:16:08.854116730 +0100
@@ -48,7 +48,11 @@
#include <stdlib.h>
#include <new>
-#include "../../lib/libflac/include/flac/all.h"
+#ifdef FLAC__NO_DLL
+#include <flac/all.h>
+#else
+#include <FLAC/all.h>
+#endif /* FLAC__NO_DLL */
/***************************************************************************
diff -up mess-0.145/src/mame/drivers/sliver.c.systemlibs mess-0.145/src/mame/drivers/sliver.c
--- mess-0.145/src/mame/drivers/sliver.c.systemlibs 2012-02-07 20:15:57.226045319 +0100
+++ mess-0.145/src/mame/drivers/sliver.c 2012-02-07 20:16:08.856116742 +0100
@@ -67,7 +67,7 @@ Notes:
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
-#include "../../lib/libjpeg/jpeglib.h"
+#include <jpeglib.h>
#define FIFO_SIZE 1024
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 15 Nov 2011 11:58:21 -0000 1.8
+++ .cvsignore 7 Feb 2012 19:58:01 -0000 1.9
@@ -1,3 +1,2 @@
ctrlr.rar
-mess0143s.zip
-mess0144s.zip
+mess0145s.zip
Index: mess.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/mess.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mess.spec 15 Nov 2011 11:58:22 -0000 1.8
+++ mess.spec 7 Feb 2012 19:58:01 -0000 1.9
@@ -1,7 +1,7 @@
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
-%global baseversion 144
+%global baseversion 145
%global snapshot 0
Name: mess
@@ -22,10 +22,13 @@
Source1: ctrlr.rar
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
+Patch2: %{name}-systemlibs.patch
BuildRequires: expat-devel
+BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
+# BuildRequires: libjpeg-devel
BuildRequires: SDL_ttf-devel
BuildRequires: unrar
BuildRequires: zlib-devel
@@ -76,6 +79,7 @@
%endif
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
+%patch2 -p1 -b .systemlibs
# Remove windows-specific documentation
rm -fr docs/win*
@@ -121,11 +125,13 @@
RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//)
%if %{with debug}
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" DEBUG=1 TARGET=mess \
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%else
-make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
- OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all TARGET=mess
+make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
+ BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="" TARGET=mess\
+ OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
%endif
@@ -159,7 +165,7 @@
%else
install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}
%endif
-install -pm 755 castool dat2html imgtool $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 castool floptool imgtool $RPM_BUILD_ROOT%{_bindir}
install -pm 644 sysinfo.dat $RPM_BUILD_ROOT%{_datadir}/%{name}
install -pm 644 artwork/* $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork
install -pm 644 hash/* $RPM_BUILD_ROOT%{_datadir}/%{name}/hash
@@ -192,7 +198,7 @@
%files tools
%doc imgtool.txt
%{_bindir}/castool
-%{_bindir}/dat2html
+%{_bindir}/floptool
%{_bindir}/imgtool
%files data
@@ -203,6 +209,12 @@
%changelog
+* Tue Feb 07 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.145-1
+- Updated to 0.145
+- Patched to use system libflac, libjpeg needs more work
+- dat2html is no more
+- Added floptool to the -tools sub-package
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Updated the Source0 URL comment
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 15 Nov 2011 11:58:22 -0000 1.8
+++ sources 7 Feb 2012 19:58:01 -0000 1.9
@@ -1,2 +1,2 @@
d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
-af4821f2575c7d8a241bc8e1243c3b20 mess0144s.zip
+3beb88328d0627b21e6e122572526110 mess0145s.zip
12 years, 9 months
rpms/subtitleripper/devel subtitleripper.spec,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/subtitleripper/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18438
Modified Files:
subtitleripper.spec
Log Message:
Rebuilt again for f-17
Index: subtitleripper.spec
===================================================================
RCS file: /cvs/free/rpms/subtitleripper/devel/subtitleripper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- subtitleripper.spec 25 Jan 2012 15:01:21 -0000 1.5
+++ subtitleripper.spec 7 Feb 2012 17:04:59 -0000 1.6
@@ -1,7 +1,7 @@
Summary: A tool to rip DVD subtitles
Name: subtitleripper
Version: 0.3.4
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://subtitleripper.sourceforge.net/
@@ -50,10 +50,7 @@
#-----------------------------------------------------------------------------
%changelog
-* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.4-8
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.3-7
12 years, 9 months
rpms/akmods/devel akmods.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/akmods/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23832/devel
Modified Files:
akmods.spec
Log Message:
- Update for UsrMove support
- Remove unused references to older fedora
- Change Requires from kernel-devel to kernel-devel-uname-r
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- akmods.spec 7 Feb 2012 12:52:51 -0000 1.11
+++ akmods.spec 7 Feb 2012 13:04:13 -0000 1.12
@@ -1,6 +1,6 @@
Name: akmods
-Version: 0.3.8
-Release: 3%{?dist}.1
+Version: 0.4.0
+Release: 1%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
@@ -30,28 +30,18 @@
Requires: bzip2 coreutils diffutils file findutils gawk gcc grep
Requires: gzip perl make sed tar unzip util-linux which rpm-build
-# do we need akmods-{xen,PAE,foo,bar} packages that depend on the proper
-# kernel-devel package? Well, maybe later; for now we just go with the
-# easy variant; note that the requires is weak in any case, as a older
-# kernel-devel package can provice it as well :-/
-Requires: kernel-devel
+# We use a virtual provide that would match either
+# kernel-devel or kernel-PAE-devel
+Requires: kernel-devel-uname-r
# we create a special user that used by akmods to build kmod packages
Requires(pre): shadow-utils
-%if %fedora <= 15
-# for the akmods init script:
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-
-%else
# systemd unit requirements.
BuildRequires: systemd-units
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-%endif
%description
@@ -90,34 +80,18 @@
-c "User is used by akmods to build akmod packages" akmods
%post
-%if %fedora <= 15
-# add init script
-/sbin/chkconfig --add akmods
-# enable init script; users that installed akmods directly or indirectly
-# want it to work
-if [ $1 = 1 ]; then
- /sbin/chkconfig akmods on
-fi
-%else
# Systemd
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable akmods.service >/dev/null 2>&1 || :
fi
-%endif
%preun
-%if %fedora <= 15
-if [ $1 = 0 ]; then
- /sbin/chkconfig --del akmods
-fi
-%else
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable akmods.service > /dev/null 2>&1 || :
/bin/systemctl stop akmods.service > /dev/null 2>&1 || :
fi
-%endif
%files
@@ -125,18 +99,16 @@
%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_bindir}/akmodsbuild
%{_sbindir}/akmods
-%if %fedora <= 15
-%{_initrddir}/akmods
-%else
%{_unitdir}/akmods.service
-%endif
%{_sysconfdir}/kernel/postinst.d/akmods
%{_mandir}/man1/*
%changelog
-* Wed Feb 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.3.8-3.1
-- AkmodUsrMove
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.0-1
+- Update for UsrMove support
+- Remove unused references to older fedora
+- Change Requires from kernel-devel to kernel-devel-uname-r
* Tue Nov 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.8-3
- Kmod can be newer than akmod due to rebuilds for new kernels (#2063)
12 years, 9 months