rpms/ffmpeg/devel .cvsignore, 1.8, 1.9 ffmpeg.spec, 1.13, 1.14 sources, 1.8, 1.9
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22061
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Sat Jan 31 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.58.20090131
- 20090131 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 17 Dec 2008 20:32:18 -0000 1.8
+++ .cvsignore 31 Jan 2009 23:50:47 -0000 1.9
@@ -1 +1 @@
-ffmpeg-20081217.tar.bz2
+ffmpeg-20090131.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ffmpeg.spec 17 Dec 2008 20:32:18 -0000 1.13
+++ ffmpeg.spec 31 Jan 2009 23:50:47 -0000 1.14
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%define svn 20081217
+%define svn 20090131
%define faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.57.%{svn}%{?dist}
+Release: 0.58.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
@@ -210,6 +210,7 @@
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffserver.1*
+%{_datadir}/ffmpeg
%files libs
%defattr(-,root,root,-)
@@ -245,6 +246,9 @@
%changelog
+* Sat Jan 31 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.58.20090131
+- 20090131 snapshot
+
* Wed Dec 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.57.20081217
- 20081217 snapshot
- fix pkgconfig files again (broken in 0.4.9-0.55.20081214)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 17 Dec 2008 20:32:18 -0000 1.8
+++ sources 31 Jan 2009 23:50:47 -0000 1.9
@@ -1 +1 @@
-ebcf1a05afa1014008447009521bbaa2 ffmpeg-20081217.tar.bz2
+d1290cd26ffdba89af962529f86f904f ffmpeg-20090131.tar.bz2
15 years, 9 months
rpms/kmodtool/F-9 kmodtool-kmodtool,1.2,1.3 kmodtool.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/kmodtool/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6506
Modified Files:
kmodtool-kmodtool kmodtool.spec
Log Message:
* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
avoid problems if user has a newer akmods package that wants to install
a newer kmod-${kmodname}-${kernel_uname_r}
Index: kmodtool-kmodtool
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-9/kmodtool-kmodtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool-kmodtool 17 Dec 2008 17:05:09 -0000 1.2
+++ kmodtool-kmodtool 31 Jan 2009 18:43:16 -0000 1.3
@@ -26,7 +26,7 @@
shopt -s extglob
myprog="kmodtool-${repo}"
-myver="0.11.3"
+myver="0.11.4"
kmodname=
build_kernels="current"
@@ -184,7 +184,7 @@
Group: System Environment/Kernel
Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kmod-${kmodname}-${kernel_uname_r} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kmod-${kmodname}-${kernel_uname_r} >= %{?epoch:%{epoch}:}%{version}-%{release}
%description -n kmod-${kmodname}${kernel_variant}
This is a meta-package without payload which sole purpose is to require the
Index: kmodtool.spec
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-9/kmodtool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool.spec 17 Dec 2008 17:05:09 -0000 1.2
+++ kmodtool.spec 31 Jan 2009 18:43:16 -0000 1.3
@@ -1,6 +1,6 @@
Name: kmodtool
Version: 1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Tool for building kmod packages
Group: Development/Tools
@@ -51,6 +51,11 @@
%{_datadir}/%{name}/
%changelog
+* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
+- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
+ avoid problems if user has a newer akmods package that wants to install
+ a newer kmod-${kmodname}-${kernel_uname_r}
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-14
- don't require the kmod-meta package in kmod-(uname -r) packages
15 years, 9 months
rpms/kmodtool/F-10 kmodtool-kmodtool,1.2,1.3 kmodtool.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/kmodtool/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6398
Modified Files:
kmodtool-kmodtool kmodtool.spec
Log Message:
* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
avoid problems if user has a newer akmods package that wants to install
a newer kmod-${kmodname}-${kernel_uname_r}
Index: kmodtool-kmodtool
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-10/kmodtool-kmodtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool-kmodtool 17 Dec 2008 17:04:39 -0000 1.2
+++ kmodtool-kmodtool 31 Jan 2009 18:43:03 -0000 1.3
@@ -26,7 +26,7 @@
shopt -s extglob
myprog="kmodtool-${repo}"
-myver="0.11.3"
+myver="0.11.4"
kmodname=
build_kernels="current"
@@ -184,7 +184,7 @@
Group: System Environment/Kernel
Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kmod-${kmodname}-${kernel_uname_r} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kmod-${kmodname}-${kernel_uname_r} >= %{?epoch:%{epoch}:}%{version}-%{release}
%description -n kmod-${kmodname}${kernel_variant}
This is a meta-package without payload which sole purpose is to require the
Index: kmodtool.spec
===================================================================
RCS file: /cvs/free/rpms/kmodtool/F-10/kmodtool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool.spec 17 Dec 2008 17:04:39 -0000 1.2
+++ kmodtool.spec 31 Jan 2009 18:43:03 -0000 1.3
@@ -1,6 +1,6 @@
Name: kmodtool
Version: 1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Tool for building kmod packages
Group: Development/Tools
@@ -51,6 +51,11 @@
%{_datadir}/%{name}/
%changelog
+* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
+- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
+ avoid problems if user has a newer akmods package that wants to install
+ a newer kmod-${kmodname}-${kernel_uname_r}
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-14
- don't require the kmod-meta package in kmod-(uname -r) packages
15 years, 9 months
rpms/gambatte/F-9 gambatte-0.4.1-cflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gambatte.spec, 1.1, 1.2 sources, 1.2, 1.3 gambatte-0.4.0-alsa.patch, 1.1, NONE gambatte-0.4.0-cflags.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5014
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-0.4.1-cflags.patch
Removed Files:
gambatte-0.4.0-alsa.patch gambatte-0.4.0-cflags.patch
Log Message:
* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
- Updated to upstream 0.4.1
- Changed back to qt4-devel from qt-devel in BR
- Changed descriptions to match the one upstream uses
- Dropped alsa patch, applied upstream
- Changed libname to avoid future collisions with upstream
gambatte-0.4.1-cflags.patch:
--- NEW FILE gambatte-0.4.1-cflags.patch ---
diff -dur gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro
--- gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro 2009-01-10 23:32:09.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro 2009-01-11 10:40:28.000000000 +0100
@@ -68,7 +68,6 @@
INCLUDEPATH += framework/SDL_Joystick/include
INCLUDEPATH += $$COMMONPATH
DEFINES += HAVE_STDINT_H
-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
macx {
# CONFIG += x86 ppc
diff -dur gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct gambatte_src-0.4.1/gambatte_sdl/SConstruct
--- gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct 2009-01-10 22:47:57.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_sdl/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H'
env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'],
diff -dur gambatte_src-0.4.1.orig/libgambatte/SConstruct gambatte_src-0.4.1/libgambatte/SConstruct
--- gambatte_src-0.4.1.orig/libgambatte/SConstruct 2009-01-10 22:47:58.000000000 +0100
+++ gambatte_src-0.4.1/libgambatte/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H -DCHAR_WIDTH_8'
env = Environment(CPPPATH = ['src', 'include', '../common'],
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Dec 2008 09:30:22 -0000 1.2
+++ .cvsignore 31 Jan 2009 18:17:36 -0000 1.3
@@ -1 +1 @@
-gambatte_src-0.4.0.tar.gz
+gambatte_src-0.4.1.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-9/gambatte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambatte.spec 4 Dec 2008 09:30:22 -0000 1.1
+++ gambatte.spec 31 Jan 2009 18:17:36 -0000 1.2
@@ -1,9 +1,10 @@
-%define libname lib%{name}.so
-%define soname %{libname}.0
+%define libname_u %{name}
+%define libname %{name}-%{version}
+%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.0
-Release: 4%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
Group: Applications/Emulators
@@ -11,18 +12,17 @@
URL: http://sourceforge.net/projects/gambatte/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}_src-%{version}.tar.gz
Source1: gambatte-qt.desktop
+# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.0-cflags.patch
+Patch0: %{name}-0.4.1-cflags.patch
Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# Patch submitted upstream SF #2377772
-Patch2: %{name}-0.4.0-alsa.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons
BuildRequires: minizip-devel
BuildRequires: SDL-devel
-BuildRequires: qt-devel >= 4
+BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
@@ -31,7 +31,7 @@
%description
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -42,7 +42,7 @@
%description -n libgambatte
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -65,7 +65,7 @@
%description qt
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -78,7 +78,7 @@
%description sdl
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -89,7 +89,6 @@
%setup -q -n %{name}_src-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Fix file encoding
for txtfile in README \
@@ -106,6 +105,11 @@
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
sed -i 's/env.Library/env.SharedLibrary/' libgambatte/SConstruct
+# Change library name to avoid future collisions with upstream
+sed -i "s/'%{libname_u}'/'%{libname}'/" libgambatte/SConstruct
+sed -i 's/-l%{libname_u}/-l%{libname}/' gambatte_qt/src/src.pro
+sed -i "s/'%{libname_u}'/'%{libname}'/" gambatte_sdl/SConstruct
+
%build
export QMAKE_CFLAGS="%{optflags}"
@@ -113,10 +117,6 @@
pushd libgambatte
scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
-# Make symlinks now as they are needed
-mv %{libname} %{soname}
-ln -s %{soname} %{libname}.%{version}
-ln -s %{soname} %{libname}
popd
pushd gambatte_sdl
@@ -136,11 +136,9 @@
install -d -m 755 %{buildroot}%{_includedir}/%{name}
install -m 644 libgambatte/include/* %{buildroot}%{_includedir}/%{name}
-# Install lib and symlinks
+# Install lib
install -d -m 755 %{buildroot}%{_libdir}
install -m 755 libgambatte/%{soname} %{buildroot}%{_libdir}
-mv libgambatte/%{libname}.%{version} %{buildroot}%{_libdir}
-mv libgambatte/%{libname} %{buildroot}%{_libdir}
# Install bin files
install -d -m 755 %{buildroot}%{_bindir}
@@ -190,14 +188,12 @@
%files -n libgambatte
%defattr(-,root,root,-)
-%{_libdir}/%{libname}.%{version}
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
%defattr(-,root,root,-)
-%{_libdir}/%{libname}
%{_includedir}/%{name}
%doc changelog COPYING README
@@ -220,6 +216,13 @@
%changelog
+* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
+- Updated to upstream 0.4.1
+- Changed back to qt4-devel from qt-devel in BR
+- Changed descriptions to match the one upstream uses
+- Dropped alsa patch, applied upstream
+- Changed libname to avoid future collisions with upstream
+
* Tue Dec 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.0-4
- Changed qt4-devel to qt-devel in BR
- Added a patch to compile alsa under linux 64bit systems
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Dec 2008 09:30:22 -0000 1.2
+++ sources 31 Jan 2009 18:17:36 -0000 1.3
@@ -1 +1 @@
-c0e0976eadb21a46716a5bb07d9e6cef gambatte_src-0.4.0.tar.gz
+cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
--- gambatte-0.4.0-alsa.patch DELETED ---
--- gambatte-0.4.0-cflags.patch DELETED ---
15 years, 9 months
rpms/kmodtool/devel kmodtool-kmodtool, 1.2, 1.3 kmodtool.spec, 1.2, 1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/kmodtool/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4907
Modified Files:
kmodtool-kmodtool kmodtool.spec
Log Message:
* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
avoid problems if user has a newer akmods package that wants to install
a newer kmod-${kmodname}-${kernel_uname_r}
Index: kmodtool-kmodtool
===================================================================
RCS file: /cvs/free/rpms/kmodtool/devel/kmodtool-kmodtool,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool-kmodtool 14 Dec 2008 09:05:06 -0000 1.2
+++ kmodtool-kmodtool 31 Jan 2009 18:17:20 -0000 1.3
@@ -26,7 +26,7 @@
shopt -s extglob
myprog="kmodtool-${repo}"
-myver="0.11.3"
+myver="0.11.4"
kmodname=
build_kernels="current"
@@ -184,7 +184,7 @@
Group: System Environment/Kernel
Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kmod-${kmodname}-${kernel_uname_r} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kmod-${kmodname}-${kernel_uname_r} >= %{?epoch:%{epoch}:}%{version}-%{release}
%description -n kmod-${kmodname}${kernel_variant}
This is a meta-package without payload which sole purpose is to require the
Index: kmodtool.spec
===================================================================
RCS file: /cvs/free/rpms/kmodtool/devel/kmodtool.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmodtool.spec 14 Dec 2008 09:05:06 -0000 1.2
+++ kmodtool.spec 31 Jan 2009 18:17:20 -0000 1.3
@@ -1,6 +1,6 @@
Name: kmodtool
Version: 1
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Tool for building kmod packages
Group: Development/Tools
@@ -51,6 +51,11 @@
%{_datadir}/%{name}/
%changelog
+* Sat Jan 31 2009 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-15
+- require kmod-${kmodname}-${kernel_uname_r} with >= in meta package to
+ avoid problems if user has a newer akmods package that wants to install
+ a newer kmod-${kmodname}-${kernel_uname_r}
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1-14
- don't require the kmod-meta package in kmod-(uname -r) packages
15 years, 9 months
rpms/gambatte/F-10 gambatte-0.4.1-cflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gambatte.spec, 1.1, 1.2 sources, 1.2, 1.3 gambatte-0.4.0-alsa.patch, 1.1, NONE gambatte-0.4.0-cflags.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4411
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-0.4.1-cflags.patch
Removed Files:
gambatte-0.4.0-alsa.patch gambatte-0.4.0-cflags.patch
Log Message:
* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
- Updated to upstream 0.4.1
- Changed back to qt4-devel from qt-devel in BR
- Changed descriptions to match the one upstream uses
- Dropped alsa patch, applied upstream
- Changed libname to avoid future collisions with upstream
gambatte-0.4.1-cflags.patch:
--- NEW FILE gambatte-0.4.1-cflags.patch ---
diff -dur gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro
--- gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro 2009-01-10 23:32:09.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro 2009-01-11 10:40:28.000000000 +0100
@@ -68,7 +68,6 @@
INCLUDEPATH += framework/SDL_Joystick/include
INCLUDEPATH += $$COMMONPATH
DEFINES += HAVE_STDINT_H
-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
macx {
# CONFIG += x86 ppc
diff -dur gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct gambatte_src-0.4.1/gambatte_sdl/SConstruct
--- gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct 2009-01-10 22:47:57.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_sdl/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H'
env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'],
diff -dur gambatte_src-0.4.1.orig/libgambatte/SConstruct gambatte_src-0.4.1/libgambatte/SConstruct
--- gambatte_src-0.4.1.orig/libgambatte/SConstruct 2009-01-10 22:47:58.000000000 +0100
+++ gambatte_src-0.4.1/libgambatte/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H -DCHAR_WIDTH_8'
env = Environment(CPPPATH = ['src', 'include', '../common'],
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Dec 2008 09:29:15 -0000 1.2
+++ .cvsignore 31 Jan 2009 18:15:17 -0000 1.3
@@ -1 +1 @@
-gambatte_src-0.4.0.tar.gz
+gambatte_src-0.4.1.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-10/gambatte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambatte.spec 4 Dec 2008 09:29:15 -0000 1.1
+++ gambatte.spec 31 Jan 2009 18:15:17 -0000 1.2
@@ -1,9 +1,10 @@
-%define libname lib%{name}.so
-%define soname %{libname}.0
+%define libname_u %{name}
+%define libname %{name}-%{version}
+%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.0
-Release: 4%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
Group: Applications/Emulators
@@ -11,18 +12,17 @@
URL: http://sourceforge.net/projects/gambatte/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}_src-%{version}.tar.gz
Source1: gambatte-qt.desktop
+# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.0-cflags.patch
+Patch0: %{name}-0.4.1-cflags.patch
Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# Patch submitted upstream SF #2377772
-Patch2: %{name}-0.4.0-alsa.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons
BuildRequires: minizip-devel
BuildRequires: SDL-devel
-BuildRequires: qt-devel >= 4
+BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
@@ -31,7 +31,7 @@
%description
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -42,7 +42,7 @@
%description -n libgambatte
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -65,7 +65,7 @@
%description qt
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -78,7 +78,7 @@
%description sdl
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -89,7 +89,6 @@
%setup -q -n %{name}_src-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Fix file encoding
for txtfile in README \
@@ -106,6 +105,11 @@
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
sed -i 's/env.Library/env.SharedLibrary/' libgambatte/SConstruct
+# Change library name to avoid future collisions with upstream
+sed -i "s/'%{libname_u}'/'%{libname}'/" libgambatte/SConstruct
+sed -i 's/-l%{libname_u}/-l%{libname}/' gambatte_qt/src/src.pro
+sed -i "s/'%{libname_u}'/'%{libname}'/" gambatte_sdl/SConstruct
+
%build
export QMAKE_CFLAGS="%{optflags}"
@@ -113,10 +117,6 @@
pushd libgambatte
scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
-# Make symlinks now as they are needed
-mv %{libname} %{soname}
-ln -s %{soname} %{libname}.%{version}
-ln -s %{soname} %{libname}
popd
pushd gambatte_sdl
@@ -136,11 +136,9 @@
install -d -m 755 %{buildroot}%{_includedir}/%{name}
install -m 644 libgambatte/include/* %{buildroot}%{_includedir}/%{name}
-# Install lib and symlinks
+# Install lib
install -d -m 755 %{buildroot}%{_libdir}
install -m 755 libgambatte/%{soname} %{buildroot}%{_libdir}
-mv libgambatte/%{libname}.%{version} %{buildroot}%{_libdir}
-mv libgambatte/%{libname} %{buildroot}%{_libdir}
# Install bin files
install -d -m 755 %{buildroot}%{_bindir}
@@ -190,14 +188,12 @@
%files -n libgambatte
%defattr(-,root,root,-)
-%{_libdir}/%{libname}.%{version}
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
%defattr(-,root,root,-)
-%{_libdir}/%{libname}
%{_includedir}/%{name}
%doc changelog COPYING README
@@ -220,6 +216,13 @@
%changelog
+* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
+- Updated to upstream 0.4.1
+- Changed back to qt4-devel from qt-devel in BR
+- Changed descriptions to match the one upstream uses
+- Dropped alsa patch, applied upstream
+- Changed libname to avoid future collisions with upstream
+
* Tue Dec 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.0-4
- Changed qt4-devel to qt-devel in BR
- Added a patch to compile alsa under linux 64bit systems
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Dec 2008 09:29:15 -0000 1.2
+++ sources 31 Jan 2009 18:15:17 -0000 1.3
@@ -1 +1 @@
-c0e0976eadb21a46716a5bb07d9e6cef gambatte_src-0.4.0.tar.gz
+cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
--- gambatte-0.4.0-alsa.patch DELETED ---
--- gambatte-0.4.0-cflags.patch DELETED ---
15 years, 9 months
rpms/gambatte/devel gambatte-0.4.1-cflags.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gambatte.spec, 1.1, 1.2 sources, 1.2, 1.3 gambatte-0.4.0-alsa.patch, 1.1, NONE gambatte-0.4.0-cflags.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3373
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-0.4.1-cflags.patch
Removed Files:
gambatte-0.4.0-alsa.patch gambatte-0.4.0-cflags.patch
Log Message:
* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
- Updated to upstream 0.4.1
- Changed back to qt4-devel from qt-devel in BR
- Changed descriptions to match the one upstream uses
- Dropped alsa patch, applied upstream
- Changed libname to avoid future collisions with upstream
gambatte-0.4.1-cflags.patch:
--- NEW FILE gambatte-0.4.1-cflags.patch ---
diff -dur gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro
--- gambatte_src-0.4.1.orig/gambatte_qt/src/framework/framework.pro 2009-01-10 23:32:09.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_qt/src/framework/framework.pro 2009-01-11 10:40:28.000000000 +0100
@@ -68,7 +68,6 @@
INCLUDEPATH += framework/SDL_Joystick/include
INCLUDEPATH += $$COMMONPATH
DEFINES += HAVE_STDINT_H
-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
macx {
# CONFIG += x86 ppc
diff -dur gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct gambatte_src-0.4.1/gambatte_sdl/SConstruct
--- gambatte_src-0.4.1.orig/gambatte_sdl/SConstruct 2009-01-10 22:47:57.000000000 +0100
+++ gambatte_src-0.4.1/gambatte_sdl/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H'
env = Environment(CPPPATH = ['src', '../libgambatte/include', '../common'],
diff -dur gambatte_src-0.4.1.orig/libgambatte/SConstruct gambatte_src-0.4.1/libgambatte/SConstruct
--- gambatte_src-0.4.1.orig/libgambatte/SConstruct 2009-01-10 22:47:58.000000000 +0100
+++ gambatte_src-0.4.1/libgambatte/SConstruct 2009-01-11 10:40:28.000000000 +0100
@@ -1,5 +1,5 @@
-global_cflags = ARGUMENTS.get('CFLAGS', '-Wall -Wextra -O2 -fomit-frame-pointer')
-global_cxxflags = ARGUMENTS.get('CXXFLAGS', global_cflags + ' -fno-exceptions -fno-rtti')
+global_cflags = ARGUMENTS.get('CFLAGS')
+global_cxxflags = ARGUMENTS.get('CXXFLAGS')
global_defines = ' -DHAVE_STDINT_H -DCHAR_WIDTH_8'
env = Environment(CPPPATH = ['src', 'include', '../common'],
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Dec 2008 09:26:48 -0000 1.2
+++ .cvsignore 31 Jan 2009 18:00:04 -0000 1.3
@@ -1 +1 @@
-gambatte_src-0.4.0.tar.gz
+gambatte_src-0.4.1.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/gambatte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gambatte.spec 4 Dec 2008 09:26:48 -0000 1.1
+++ gambatte.spec 31 Jan 2009 18:00:04 -0000 1.2
@@ -1,9 +1,10 @@
-%define libname lib%{name}.so
-%define soname %{libname}.0
+%define libname_u %{name}
+%define libname %{name}-%{version}
+%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.0
-Release: 4%{?dist}
+Version: 0.4.1
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
Group: Applications/Emulators
@@ -11,18 +12,17 @@
URL: http://sourceforge.net/projects/gambatte/
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}_src-%{version}.tar.gz
Source1: gambatte-qt.desktop
+# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.0-cflags.patch
+Patch0: %{name}-0.4.1-cflags.patch
Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# Patch submitted upstream SF #2377772
-Patch2: %{name}-0.4.0-alsa.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scons
BuildRequires: minizip-devel
BuildRequires: SDL-devel
-BuildRequires: qt-devel >= 4
+BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
@@ -31,7 +31,7 @@
%description
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -42,7 +42,7 @@
%description -n libgambatte
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -65,7 +65,7 @@
%description qt
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -78,7 +78,7 @@
%description sdl
Gambatte is an accuracy-focused, open-source, cross-platform
-Game Boy / Game Boy Color emulator written in C++. It is based on hundreds of
+Game Boy Color emulator written in C++. It is based on hundreds of
corner case hardware tests, as well as previous documentation and reverse
engineering efforts.
@@ -89,7 +89,6 @@
%setup -q -n %{name}_src-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
# Fix file encoding
for txtfile in README \
@@ -106,6 +105,11 @@
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
sed -i 's/env.Library/env.SharedLibrary/' libgambatte/SConstruct
+# Change library name to avoid future collisions with upstream
+sed -i "s/'%{libname_u}'/'%{libname}'/" libgambatte/SConstruct
+sed -i 's/-l%{libname_u}/-l%{libname}/' gambatte_qt/src/src.pro
+sed -i "s/'%{libname_u}'/'%{libname}'/" gambatte_sdl/SConstruct
+
%build
export QMAKE_CFLAGS="%{optflags}"
@@ -113,10 +117,6 @@
pushd libgambatte
scons %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
-# Make symlinks now as they are needed
-mv %{libname} %{soname}
-ln -s %{soname} %{libname}.%{version}
-ln -s %{soname} %{libname}
popd
pushd gambatte_sdl
@@ -136,11 +136,9 @@
install -d -m 755 %{buildroot}%{_includedir}/%{name}
install -m 644 libgambatte/include/* %{buildroot}%{_includedir}/%{name}
-# Install lib and symlinks
+# Install lib
install -d -m 755 %{buildroot}%{_libdir}
install -m 755 libgambatte/%{soname} %{buildroot}%{_libdir}
-mv libgambatte/%{libname}.%{version} %{buildroot}%{_libdir}
-mv libgambatte/%{libname} %{buildroot}%{_libdir}
# Install bin files
install -d -m 755 %{buildroot}%{_bindir}
@@ -190,14 +188,12 @@
%files -n libgambatte
%defattr(-,root,root,-)
-%{_libdir}/%{libname}.%{version}
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
%defattr(-,root,root,-)
-%{_libdir}/%{libname}
%{_includedir}/%{name}
%doc changelog COPYING README
@@ -220,6 +216,13 @@
%changelog
+* Sat Jan 31 2009 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-1
+- Updated to upstream 0.4.1
+- Changed back to qt4-devel from qt-devel in BR
+- Changed descriptions to match the one upstream uses
+- Dropped alsa patch, applied upstream
+- Changed libname to avoid future collisions with upstream
+
* Tue Dec 02 2008 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.0-4
- Changed qt4-devel to qt-devel in BR
- Added a patch to compile alsa under linux 64bit systems
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Dec 2008 09:26:48 -0000 1.2
+++ sources 31 Jan 2009 18:00:04 -0000 1.3
@@ -1 +1 @@
-c0e0976eadb21a46716a5bb07d9e6cef gambatte_src-0.4.0.tar.gz
+cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
--- gambatte-0.4.0-alsa.patch DELETED ---
--- gambatte-0.4.0-cflags.patch DELETED ---
15 years, 9 months
rpms/fglrx-kmod/F-9 fglrx-kmod.spec,1.19,1.20
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32201/F-9
Modified Files:
fglrx-kmod.spec
Log Message:
Re-enable current macro for kmod rebuilds in the future
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- fglrx-kmod.spec 31 Jan 2009 16:59:18 -0000 1.19
+++ fglrx-kmod.spec 31 Jan 2009 17:00:37 -0000 1.20
@@ -3,7 +3,7 @@
# "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 newest
%define ativersion 9.1
15 years, 9 months
rpms/fglrx-kmod/F-10 fglrx-kmod.spec,1.23,1.24
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32201/F-10
Modified Files:
fglrx-kmod.spec
Log Message:
Re-enable current macro for kmod rebuilds in the future
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/fglrx-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fglrx-kmod.spec 31 Jan 2009 06:25:36 -0000 1.23
+++ fglrx-kmod.spec 31 Jan 2009 17:00:37 -0000 1.24
@@ -3,7 +3,7 @@
# "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 newest
%define ativersion 9.1
15 years, 9 months
rpms/fglrx-kmod/devel fglrx-kmod.spec,1.24,1.25
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32201/devel
Modified Files:
fglrx-kmod.spec
Log Message:
Re-enable current macro for kmod rebuilds in the future
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fglrx-kmod.spec 31 Jan 2009 06:25:36 -0000 1.24
+++ fglrx-kmod.spec 31 Jan 2009 17:00:37 -0000 1.25
@@ -3,7 +3,7 @@
# "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 newest
%define ativersion 9.1
15 years, 9 months
