rpms/gambatte/F-18 gambatte-537-minizip.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gambatte.spec, 1.7, 1.8 sources, 1.3, 1.4 gambatte-0.4.0-usesystemlibraries.patch, 1.1, NONE gambatte-0.4.1-cflags.patch, 1.1, NONE gambatte-0.4.1-gcc44.patch, 1.1, NONE gambatte-0.4.1-libraries.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25691
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-537-minizip.patch
Removed Files:
gambatte-0.4.0-usesystemlibraries.patch
gambatte-0.4.1-cflags.patch gambatte-0.4.1-gcc44.patch
gambatte-0.4.1-libraries.patch
Log Message:
* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
- Updated to upstream r537
- Dropped obsolete Group, Buildroot, %clean and %defattr
gambatte-537-minizip.patch:
SConstruct | 4 +---
src/file/file_zip.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE gambatte-537-minizip.patch ---
diff -durN gambatte_src-r537.orig/libgambatte/SConstruct gambatte_src-r537/libgambatte/SConstruct
--- gambatte_src-r537.orig/libgambatte/SConstruct 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/SConstruct 2013-07-01 14:39:15.599514127 +0200
@@ -44,9 +44,7 @@
conf = env.Configure()
-if conf.CheckHeader('zlib.h'):
- sourceFiles.append('src/file/unzip/unzip.c')
- sourceFiles.append('src/file/unzip/ioapi.c')
+if conf.CheckLib('z', autoadd=1) and conf.CheckLib('minizip', autoadd=1):
sourceFiles.append('src/file/file_zip.cpp')
else:
sourceFiles.append('src/file/file.cpp')
diff -durN gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp gambatte_src-r537/libgambatte/src/file/file_zip.cpp
--- gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/src/file/file_zip.cpp 2013-07-01 14:39:57.325515266 +0200
@@ -24,7 +24,7 @@
#include <cstring>
namespace zlib {
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
}
namespace {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-18/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Jan 2009 18:00:04 -0000 1.3
+++ .cvsignore 11 Jul 2013 15:16:47 -0000 1.4
@@ -1 +1 @@
-gambatte_src-0.4.1.tar.gz
+gambatte_src-r537.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-18/gambatte.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gambatte.spec 17 Mar 2012 20:01:40 -0000 1.7
+++ gambatte.spec 11 Jul 2013 15:16:47 -0000 1.8
@@ -3,25 +3,19 @@
%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.1
-Release: 6%{?dist}
+Version: 537
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
-Group: Applications/Emulators
License: GPLv2
URL: http://sourceforge.net/projects/gambatte/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-r%{version}.tar.gz
Source1: gambatte-qt.desktop
# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.1-cflags.patch
-Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# https://sourceforge.net/tracker/?func=detail&aid=2731060&group_id=203791&...
-Patch2: %{name}-0.4.1-gcc44.patch
-# Upstream SVN
-Patch3: %{name}-0.4.1-libraries.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Use system minizip
+Patch0: %{name}-537-minizip.patch
BuildRequires: scons
BuildRequires: minizip-devel
@@ -29,7 +23,7 @@
BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
-BuildRequires: ImageMagick
+BuildRequires: ImageMagick
Requires: hicolor-icon-theme
@@ -90,22 +84,24 @@
%prep
-%setup -q -n %{name}_src-%{version}
+%setup -q -n %{name}_src-r%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# Fix file encoding
-for txtfile in README \
- gambatte_qt/man/gambatte_qt.6 \
- gambatte_sdl/man/gambatte_sdl.6;
+for txtfile in README
do
iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
touch -r $txtfile tmp
mv tmp $txtfile
done
+# Fix premissions
+find . \( -name *.cpp -o -name *.h \) -exec chmod 644 {} \;
+
+# Use RPM_OPT_FLAGS
+sed -i '/QMAKE_CFLAGS/d' gambatte_qt/src/src.pro
+sed -i '/QMAKE_CXXFLAGS/d' gambatte_qt/src/src.pro
+
# Build a dynamic library
sed -i '/^env.Library/i\
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
@@ -114,7 +110,7 @@
# 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
+sed -i "s/libgambatte.a/%{soname}/" gambatte_sdl/SConstruct
%build
@@ -130,7 +126,7 @@
popd
pushd gambatte_qt
-qmake-qt4
+qmake-qt4
make %{?_smp_mflags}
popd
@@ -151,11 +147,6 @@
install -m 755 gambatte_sdl/gambatte_sdl %{buildroot}%{_bindir}
install -m 755 gambatte_qt/bin/gambatte_qt %{buildroot}%{_bindir}
-# Install man files
-install -d -m 755 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_sdl/man/gambatte_sdl.6 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_qt/man/gambatte_qt.6 %{buildroot}%{_mandir}/man6
-
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
@@ -188,33 +179,23 @@
-%clean
-rm -rf %{buildroot}
-
-
%files -n libgambatte
-%defattr(-,root,root,-)
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%doc changelog COPYING README
%files sdl
-%defattr(-,root,root,-)
%{_bindir}/gambatte_sdl
-%{_mandir}/man6/gambatte_sdl.6*
%doc changelog COPYING README
%files qt
-%defattr(-,root,root,-)
%{_bindir}/gambatte_qt
-%{_mandir}/man6/gambatte_qt.6*
%{_datadir}/icons/hicolor/32x32/apps/gambatte-qt.png
%{_datadir}/icons/hicolor/64x64/apps/gambatte-qt.png
%{_datadir}/applications/gambatte-qt.desktop
@@ -222,6 +203,13 @@
%changelog
+* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
+- Updated to upstream r537
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.1-7
+- Mass rebuilt for Fedora 19 Features
+
* Sat Mar 17 2012 Andrea Musuruane <musuruan(a)gmail.com> - 0.4.1-6
- Added a patch to link against libX11
- Fixed Source0 URL
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-18/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jan 2009 18:00:04 -0000 1.3
+++ sources 11 Jul 2013 15:16:47 -0000 1.4
@@ -1 +1 @@
-cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
+0c9816a9f55872a8df5da06223b83074 gambatte_src-r537.tar.gz
--- gambatte-0.4.0-usesystemlibraries.patch DELETED ---
--- gambatte-0.4.1-cflags.patch DELETED ---
--- gambatte-0.4.1-gcc44.patch DELETED ---
--- gambatte-0.4.1-libraries.patch DELETED ---
10 years, 10 months
rpms/gambatte/F-19 gambatte-537-minizip.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gambatte.spec, 1.8, 1.9 sources, 1.3, 1.4 gambatte-0.4.0-usesystemlibraries.patch, 1.1, NONE gambatte-0.4.1-cflags.patch, 1.1, NONE gambatte-0.4.1-gcc44.patch, 1.1, NONE gambatte-0.4.1-libraries.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25307
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-537-minizip.patch
Removed Files:
gambatte-0.4.0-usesystemlibraries.patch
gambatte-0.4.1-cflags.patch gambatte-0.4.1-gcc44.patch
gambatte-0.4.1-libraries.patch
Log Message:
* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
- Updated to upstream r537
- Dropped obsolete Group, Buildroot, %clean and %defattr
gambatte-537-minizip.patch:
SConstruct | 4 +---
src/file/file_zip.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE gambatte-537-minizip.patch ---
diff -durN gambatte_src-r537.orig/libgambatte/SConstruct gambatte_src-r537/libgambatte/SConstruct
--- gambatte_src-r537.orig/libgambatte/SConstruct 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/SConstruct 2013-07-01 14:39:15.599514127 +0200
@@ -44,9 +44,7 @@
conf = env.Configure()
-if conf.CheckHeader('zlib.h'):
- sourceFiles.append('src/file/unzip/unzip.c')
- sourceFiles.append('src/file/unzip/ioapi.c')
+if conf.CheckLib('z', autoadd=1) and conf.CheckLib('minizip', autoadd=1):
sourceFiles.append('src/file/file_zip.cpp')
else:
sourceFiles.append('src/file/file.cpp')
diff -durN gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp gambatte_src-r537/libgambatte/src/file/file_zip.cpp
--- gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/src/file/file_zip.cpp 2013-07-01 14:39:57.325515266 +0200
@@ -24,7 +24,7 @@
#include <cstring>
namespace zlib {
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
}
namespace {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Jan 2009 18:00:04 -0000 1.3
+++ .cvsignore 11 Jul 2013 15:14:52 -0000 1.4
@@ -1 +1 @@
-gambatte_src-0.4.1.tar.gz
+gambatte_src-r537.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/gambatte.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambatte.spec 3 Mar 2013 21:37:32 -0000 1.8
+++ gambatte.spec 11 Jul 2013 15:14:53 -0000 1.9
@@ -3,25 +3,19 @@
%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.1
-Release: 7%{?dist}
+Version: 537
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
-Group: Applications/Emulators
License: GPLv2
URL: http://sourceforge.net/projects/gambatte/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-r%{version}.tar.gz
Source1: gambatte-qt.desktop
# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.1-cflags.patch
-Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# https://sourceforge.net/tracker/?func=detail&aid=2731060&group_id=203791&...
-Patch2: %{name}-0.4.1-gcc44.patch
-# Upstream SVN
-Patch3: %{name}-0.4.1-libraries.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Use system minizip
+Patch0: %{name}-537-minizip.patch
BuildRequires: scons
BuildRequires: minizip-devel
@@ -29,7 +23,7 @@
BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
-BuildRequires: ImageMagick
+BuildRequires: ImageMagick
Requires: hicolor-icon-theme
@@ -90,22 +84,24 @@
%prep
-%setup -q -n %{name}_src-%{version}
+%setup -q -n %{name}_src-r%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# Fix file encoding
-for txtfile in README \
- gambatte_qt/man/gambatte_qt.6 \
- gambatte_sdl/man/gambatte_sdl.6;
+for txtfile in README
do
iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
touch -r $txtfile tmp
mv tmp $txtfile
done
+# Fix premissions
+find . \( -name *.cpp -o -name *.h \) -exec chmod 644 {} \;
+
+# Use RPM_OPT_FLAGS
+sed -i '/QMAKE_CFLAGS/d' gambatte_qt/src/src.pro
+sed -i '/QMAKE_CXXFLAGS/d' gambatte_qt/src/src.pro
+
# Build a dynamic library
sed -i '/^env.Library/i\
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
@@ -114,7 +110,7 @@
# 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
+sed -i "s/libgambatte.a/%{soname}/" gambatte_sdl/SConstruct
%build
@@ -130,7 +126,7 @@
popd
pushd gambatte_qt
-qmake-qt4
+qmake-qt4
make %{?_smp_mflags}
popd
@@ -151,11 +147,6 @@
install -m 755 gambatte_sdl/gambatte_sdl %{buildroot}%{_bindir}
install -m 755 gambatte_qt/bin/gambatte_qt %{buildroot}%{_bindir}
-# Install man files
-install -d -m 755 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_sdl/man/gambatte_sdl.6 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_qt/man/gambatte_qt.6 %{buildroot}%{_mandir}/man6
-
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
@@ -188,33 +179,23 @@
-%clean
-rm -rf %{buildroot}
-
-
%files -n libgambatte
-%defattr(-,root,root,-)
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%doc changelog COPYING README
%files sdl
-%defattr(-,root,root,-)
%{_bindir}/gambatte_sdl
-%{_mandir}/man6/gambatte_sdl.6*
%doc changelog COPYING README
%files qt
-%defattr(-,root,root,-)
%{_bindir}/gambatte_qt
-%{_mandir}/man6/gambatte_qt.6*
%{_datadir}/icons/hicolor/32x32/apps/gambatte-qt.png
%{_datadir}/icons/hicolor/64x64/apps/gambatte-qt.png
%{_datadir}/applications/gambatte-qt.desktop
@@ -222,6 +203,10 @@
%changelog
+* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
+- Updated to upstream r537
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.1-7
- Mass rebuilt for Fedora 19 Features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/F-19/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jan 2009 18:00:04 -0000 1.3
+++ sources 11 Jul 2013 15:14:53 -0000 1.4
@@ -1 +1 @@
-cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
+0c9816a9f55872a8df5da06223b83074 gambatte_src-r537.tar.gz
--- gambatte-0.4.0-usesystemlibraries.patch DELETED ---
--- gambatte-0.4.1-cflags.patch DELETED ---
--- gambatte-0.4.1-gcc44.patch DELETED ---
--- gambatte-0.4.1-libraries.patch DELETED ---
10 years, 10 months
rpms/gambatte/devel gambatte-537-minizip.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gambatte.spec, 1.8, 1.9 sources, 1.3, 1.4 gambatte-0.4.0-usesystemlibraries.patch, 1.1, NONE gambatte-0.4.1-cflags.patch, 1.1, NONE gambatte-0.4.1-gcc44.patch, 1.1, NONE gambatte-0.4.1-libraries.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/gambatte/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24777
Modified Files:
.cvsignore gambatte.spec sources
Added Files:
gambatte-537-minizip.patch
Removed Files:
gambatte-0.4.0-usesystemlibraries.patch
gambatte-0.4.1-cflags.patch gambatte-0.4.1-gcc44.patch
gambatte-0.4.1-libraries.patch
Log Message:
* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
- Updated to upstream r537
- Dropped obsolete Group, Buildroot, %clean and %defattr
gambatte-537-minizip.patch:
SConstruct | 4 +---
src/file/file_zip.cpp | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
--- NEW FILE gambatte-537-minizip.patch ---
diff -durN gambatte_src-r537.orig/libgambatte/SConstruct gambatte_src-r537/libgambatte/SConstruct
--- gambatte_src-r537.orig/libgambatte/SConstruct 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/SConstruct 2013-07-01 14:39:15.599514127 +0200
@@ -44,9 +44,7 @@
conf = env.Configure()
-if conf.CheckHeader('zlib.h'):
- sourceFiles.append('src/file/unzip/unzip.c')
- sourceFiles.append('src/file/unzip/ioapi.c')
+if conf.CheckLib('z', autoadd=1) and conf.CheckLib('minizip', autoadd=1):
sourceFiles.append('src/file/file_zip.cpp')
else:
sourceFiles.append('src/file/file.cpp')
diff -durN gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp gambatte_src-r537/libgambatte/src/file/file_zip.cpp
--- gambatte_src-r537.orig/libgambatte/src/file/file_zip.cpp 2013-06-01 16:43:58.000000000 +0200
+++ gambatte_src-r537/libgambatte/src/file/file_zip.cpp 2013-07-01 14:39:57.325515266 +0200
@@ -24,7 +24,7 @@
#include <cstring>
namespace zlib {
-#include "unzip/unzip.h"
+#include <minizip/unzip.h>
}
namespace {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 31 Jan 2009 18:00:04 -0000 1.3
+++ .cvsignore 11 Jul 2013 15:09:50 -0000 1.4
@@ -1 +1 @@
-gambatte_src-0.4.1.tar.gz
+gambatte_src-r537.tar.gz
Index: gambatte.spec
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/gambatte.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gambatte.spec 3 Mar 2013 21:37:32 -0000 1.8
+++ gambatte.spec 11 Jul 2013 15:09:50 -0000 1.9
@@ -3,25 +3,19 @@
%define soname lib%{libname}.so
Name: gambatte
-Version: 0.4.1
-Release: 7%{?dist}
+Version: 537
+Release: 1%{?dist}
Summary: An accuracy-focused Game Boy / Game Boy Color emulator
-Group: Applications/Emulators
License: GPLv2
URL: http://sourceforge.net/projects/gambatte/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_src-r%{version}.tar.gz
Source1: gambatte-qt.desktop
# Icon made by Peter Verschoor
Source2: gameboy_icon.png
# Andrea Musuruane
-Patch0: %{name}-0.4.1-cflags.patch
-Patch1: %{name}-0.4.0-usesystemlibraries.patch
-# https://sourceforge.net/tracker/?func=detail&aid=2731060&group_id=203791&...
-Patch2: %{name}-0.4.1-gcc44.patch
-# Upstream SVN
-Patch3: %{name}-0.4.1-libraries.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Use system minizip
+Patch0: %{name}-537-minizip.patch
BuildRequires: scons
BuildRequires: minizip-devel
@@ -29,7 +23,7 @@
BuildRequires: qt4-devel
BuildRequires: libXv-devel
BuildRequires: desktop-file-utils
-BuildRequires: ImageMagick
+BuildRequires: ImageMagick
Requires: hicolor-icon-theme
@@ -90,22 +84,24 @@
%prep
-%setup -q -n %{name}_src-%{version}
+%setup -q -n %{name}_src-r%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# Fix file encoding
-for txtfile in README \
- gambatte_qt/man/gambatte_qt.6 \
- gambatte_sdl/man/gambatte_sdl.6;
+for txtfile in README
do
iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
touch -r $txtfile tmp
mv tmp $txtfile
done
+# Fix premissions
+find . \( -name *.cpp -o -name *.h \) -exec chmod 644 {} \;
+
+# Use RPM_OPT_FLAGS
+sed -i '/QMAKE_CFLAGS/d' gambatte_qt/src/src.pro
+sed -i '/QMAKE_CXXFLAGS/d' gambatte_qt/src/src.pro
+
# Build a dynamic library
sed -i '/^env.Library/i\
env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%{soname}")' libgambatte/SConstruct
@@ -114,7 +110,7 @@
# 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
+sed -i "s/libgambatte.a/%{soname}/" gambatte_sdl/SConstruct
%build
@@ -130,7 +126,7 @@
popd
pushd gambatte_qt
-qmake-qt4
+qmake-qt4
make %{?_smp_mflags}
popd
@@ -151,11 +147,6 @@
install -m 755 gambatte_sdl/gambatte_sdl %{buildroot}%{_bindir}
install -m 755 gambatte_qt/bin/gambatte_qt %{buildroot}%{_bindir}
-# Install man files
-install -d -m 755 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_sdl/man/gambatte_sdl.6 %{buildroot}%{_mandir}/man6
-install -m 644 gambatte_qt/man/gambatte_qt.6 %{buildroot}%{_mandir}/man6
-
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor '' \
@@ -188,33 +179,23 @@
-%clean
-rm -rf %{buildroot}
-
-
%files -n libgambatte
-%defattr(-,root,root,-)
%{_libdir}/%{soname}
%doc changelog COPYING README
%files -n libgambatte-devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%doc changelog COPYING README
%files sdl
-%defattr(-,root,root,-)
%{_bindir}/gambatte_sdl
-%{_mandir}/man6/gambatte_sdl.6*
%doc changelog COPYING README
%files qt
-%defattr(-,root,root,-)
%{_bindir}/gambatte_qt
-%{_mandir}/man6/gambatte_qt.6*
%{_datadir}/icons/hicolor/32x32/apps/gambatte-qt.png
%{_datadir}/icons/hicolor/64x64/apps/gambatte-qt.png
%{_datadir}/applications/gambatte-qt.desktop
@@ -222,6 +203,10 @@
%changelog
+* Mon Jul 01 2013 Andrea Musuruane <musuruan(a)gmail.com> - 537-1
+- Updated to upstream r537
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.1-7
- Mass rebuilt for Fedora 19 Features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gambatte/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jan 2009 18:00:04 -0000 1.3
+++ sources 11 Jul 2013 15:09:50 -0000 1.4
@@ -1 +1 @@
-cfe52c33bbb2e719a957bde64427a18c gambatte_src-0.4.1.tar.gz
+0c9816a9f55872a8df5da06223b83074 gambatte_src-r537.tar.gz
--- gambatte-0.4.0-usesystemlibraries.patch DELETED ---
--- gambatte-0.4.1-cflags.patch DELETED ---
--- gambatte-0.4.1-gcc44.patch DELETED ---
--- gambatte-0.4.1-libraries.patch DELETED ---
10 years, 10 months
rpms/motion/F-19 motion.spec,1.25,1.26
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13915
Modified Files:
motion.spec
Log Message:
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.11
- try again with correct sources and ffmpeg-devel BR
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- motion.spec 10 Jul 2013 12:09:28 -0000 1.25
+++ motion.spec 10 Jul 2013 12:19:21 -0000 1.26
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.10%{?dist}
+Release: trunkREV557.11%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -12,7 +12,7 @@
Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel ffmpeg-devel
Buildrequires: pkgconfig(sqlite3)
BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
@@ -95,6 +95,9 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.11
+- try again with correct sources and ffmpeg-devel BR
+
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.10
- it seems buildsys used wrong sources all the time; reupload correct ones
10 years, 10 months
rpms/motion/F-19 motion.spec,1.24,1.25 sources,1.9,1.10
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13379
Modified Files:
motion.spec sources
Log Message:
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.10
- it seems buildsys used wrong sources all the time; reupload correct ones
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- motion.spec 10 Jul 2013 11:58:57 -0000 1.24
+++ motion.spec 10 Jul 2013 12:09:28 -0000 1.25
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.9%{?dist}
+Release: trunkREV557.10%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -95,6 +95,9 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.10
+- it seems buildsys used wrong sources all the time; reupload correct ones
+
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.9
- try without ffmpeg-devel, with ffmpeg-compat-devel only
10 years, 10 months
rpms/motion/F-19 motion.spec,1.23,1.24
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12679
Modified Files:
motion.spec
Log Message:
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.9
- try without ffmpeg-devel, with ffmpeg-compat-devel only
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- motion.spec 10 Jul 2013 11:43:18 -0000 1.23
+++ motion.spec 10 Jul 2013 11:58:57 -0000 1.24
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.8%{?dist}
+Release: trunkREV557.9%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -12,7 +12,7 @@
Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel ffmpeg-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
Buildrequires: pkgconfig(sqlite3)
BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
@@ -95,6 +95,9 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.9
+- try without ffmpeg-devel, with ffmpeg-compat-devel only
+
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8
- correct typo in logrotate patch
- rebuild hoping that ffmpeg will be picked up
10 years, 10 months
rpms/motion/F-19 motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch, 1.1, 1.2 motion.spec, 1.22, 1.23
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11645
Modified Files:
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
motion.spec
Log Message:
* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8
- correct typo in logrotate patch
- rebuild hoping that ffmpeg will be picked up
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch:
motion.logrotate | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch 19 Apr 2013 12:25:03 -0000 1.1
+++ motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch 10 Jul 2013 11:43:18 -0000 1.2
@@ -16,7 +16,7 @@
create 0600 root root
postrotate
- /bin/service motion reload >/dev/null 2>&1 || true
-+ /usr/bin systemctl reload-or-try-restart motion.service >/dev/null 2>&1 || true
++ /usr/bin/systemctl reload-or-try-restart motion.service >/dev/null 2>&1 || true
endscript
}
--
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- motion.spec 19 Apr 2013 12:25:03 -0000 1.22
+++ motion.spec 10 Jul 2013 11:43:18 -0000 1.23
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.7.1%{?dist}
+Release: trunkREV557.8%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -12,7 +12,7 @@
Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel ffmpeg-devel
Buildrequires: pkgconfig(sqlite3)
BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
@@ -95,6 +95,10 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Wed Jul 10 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8
+- correct typo in logrotate patch
+- rebuild hoping that ffmpeg will be picked up
+
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7.1
- add patches
10 years, 10 months
rpms/audacious-plugins-freeworld/F-19 .cvsignore, 1.16, 1.17 audacious-plugins-freeworld.spec, 1.30, 1.31 sources, 1.16, 1.17
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16940
Modified Files:
.cvsignore audacious-plugins-freeworld.spec sources
Log Message:
* Tue Jul 9 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.4-1
- Upgrade to 3.4, resolves rf#2849, rf#2868
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-19/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 2 Mar 2013 13:44:14 -0000 1.16
+++ .cvsignore 9 Jul 2013 14:49:54 -0000 1.17
@@ -1 +1 @@
-audacious-plugins-3.3.4.tar.bz2
+audacious-plugins-3.4.tar.bz2
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-19/audacious-plugins-freeworld.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- audacious-plugins-freeworld.spec 26 May 2013 21:38:55 -0000 1.30
+++ audacious-plugins-freeworld.spec 9 Jul 2013 14:49:55 -0000 1.31
@@ -4,8 +4,8 @@
%endif
Name: audacious-plugins-freeworld
-Version: 3.3.4
-Release: 2%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -13,7 +13,7 @@
URL: http://audacious-media-player.org/
Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
-BuildRequires: audacious-devel >= 3.3
+BuildRequires: audacious-devel >= 3.4
BuildRequires: zlib-devel, libxml2-devel
BuildRequires: taglib-devel >= 1.4
BuildRequires: libmms-devel, libmpg123-devel
@@ -135,6 +135,9 @@
%changelog
+* Tue Jul 9 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.4-1
+- Upgrade to 3.4, resolves rf#2849, rf#2868
+
* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.4-2
- Rebuilt for x264/FFmpeg
@@ -273,5 +276,5 @@
- Properly add Requires(post/postun)
- Carry over changes from main audacious-1.1.1-4 package
-* Sun Aug 01 2006 Ralf Ertzinger <ralf(a)skytale.net> 1.1.1-3.fc6
+* Tue Aug 01 2006 Ralf Ertzinger <ralf(a)skytale.net> 1.1.1-3.fc6
- Initial RPM for livna
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-19/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 2 Mar 2013 13:44:14 -0000 1.16
+++ sources 9 Jul 2013 14:49:55 -0000 1.17
@@ -1 +1 @@
-c7fc344b802557cbbe208c31e5289ef1 audacious-plugins-3.3.4.tar.bz2
+ea59b4023f32ca096519d01b8f6f33c0 audacious-plugins-3.4.tar.bz2
10 years, 10 months
rpms/audacious-plugins-freeworld/devel .cvsignore, 1.16, 1.17 audacious-plugins-freeworld.spec, 1.30, 1.31 sources, 1.16, 1.17
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16764
Modified Files:
.cvsignore audacious-plugins-freeworld.spec sources
Log Message:
* Tue Jul 9 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.4-1
- Upgrade to 3.4, resolves rf#2849, rf#2868
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 2 Mar 2013 13:44:14 -0000 1.16
+++ .cvsignore 9 Jul 2013 14:48:30 -0000 1.17
@@ -1 +1 @@
-audacious-plugins-3.3.4.tar.bz2
+audacious-plugins-3.4.tar.bz2
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- audacious-plugins-freeworld.spec 26 May 2013 21:38:41 -0000 1.30
+++ audacious-plugins-freeworld.spec 9 Jul 2013 14:48:30 -0000 1.31
@@ -4,8 +4,8 @@
%endif
Name: audacious-plugins-freeworld
-Version: 3.3.4
-Release: 2%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -13,7 +13,7 @@
URL: http://audacious-media-player.org/
Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
-BuildRequires: audacious-devel >= 3.3
+BuildRequires: audacious-devel >= 3.4
BuildRequires: zlib-devel, libxml2-devel
BuildRequires: taglib-devel >= 1.4
BuildRequires: libmms-devel, libmpg123-devel
@@ -135,6 +135,9 @@
%changelog
+* Tue Jul 9 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 3.4-1
+- Upgrade to 3.4, resolves rf#2849, rf#2868
+
* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.4-2
- Rebuilt for x264/FFmpeg
@@ -273,5 +276,5 @@
- Properly add Requires(post/postun)
- Carry over changes from main audacious-1.1.1-4 package
-* Sun Aug 01 2006 Ralf Ertzinger <ralf(a)skytale.net> 1.1.1-3.fc6
+* Tue Aug 01 2006 Ralf Ertzinger <ralf(a)skytale.net> 1.1.1-3.fc6
- Initial RPM for livna
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 2 Mar 2013 13:44:14 -0000 1.16
+++ sources 9 Jul 2013 14:48:30 -0000 1.17
@@ -1 +1 @@
-c7fc344b802557cbbe208c31e5289ef1 audacious-plugins-3.3.4.tar.bz2
+ea59b4023f32ca096519d01b8f6f33c0 audacious-plugins-3.4.tar.bz2
10 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.127,1.128
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20079
Modified Files:
nvidia-kmod.spec
Log Message:
* Mon Jul 08 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-2
- build for current
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- nvidia-kmod.spec 8 Jul 2013 17:04:03 -0000 1.127
+++ nvidia-kmod.spec 8 Jul 2013 17:05:55 -0000 1.128
@@ -9,7 +9,7 @@
Epoch: 1
Version: 325.08
# 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
@@ -85,6 +85,9 @@
%changelog
+* Mon Jul 08 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-2
+- build for current
+
* Sun Jul 07 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-1
- Update to 325.08
10 years, 10 months