rpms/frogatto/F-19 frogatto.spec,1.11,1.12
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/frogatto/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5153
Modified Files:
frogatto.spec
Log Message:
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-2
- Explicitly BuildRequires perl-podlators for manpage generation
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/frogatto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- frogatto.spec 8 Apr 2013 10:40:17 -0000 1.11
+++ frogatto.spec 8 Apr 2013 17:53:14 -0000 1.12
@@ -1,6 +1,6 @@
Name: frogatto
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An old-school 2D platform game
Group: Amusements/Games
@@ -24,7 +24,7 @@
BuildRequires: libpng-devel
BuildRequires: ccache
BuildRequires: boost-devel
-BuildRequires: perl
+BuildRequires: perl-podlators
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -117,6 +117,9 @@
%changelog
+* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-2
+- Explicitly BuildRequires perl-podlators for manpage generation
+
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
- Rebase to upstream 1.3.1 release
- Rebuild for new boost and glew
11 years, 7 months
rpms/frogatto/devel frogatto.spec,1.11,1.12
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/frogatto/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30422
Modified Files:
frogatto.spec
Log Message:
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-2
- Explicitly BuildRequires perl-podlators for manpage generation
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- frogatto.spec 8 Apr 2013 10:25:26 -0000 1.11
+++ frogatto.spec 8 Apr 2013 14:59:03 -0000 1.12
@@ -1,6 +1,6 @@
Name: frogatto
Version: 1.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An old-school 2D platform game
Group: Amusements/Games
@@ -24,7 +24,7 @@
BuildRequires: libpng-devel
BuildRequires: ccache
BuildRequires: boost-devel
-BuildRequires: perl
+BuildRequires: perl-podlators
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -117,6 +117,9 @@
%changelog
+* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-2
+- Explicitly BuildRequires perl-podlators for manpage generation
+
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
- Rebase to upstream 1.3.1 release
- Rebuild for new boost and glew
11 years, 7 months
rpms/vlc/F-17 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, NONE, 1.1 .cvsignore, 1.51, 1.52 sources, 1.59, 1.60 vlc.spec, 1.157, 1.158
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24899/F-17
Modified Files:
.cvsignore sources vlc.spec
Added Files:
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
Log Message:
Update to 2.0.06
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch:
flac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch ---
diff -up vlc-2.0.5/modules/codec/flac.c.FLAC13 vlc-2.0.5/modules/codec/flac.c
--- vlc-2.0.5/modules/codec/flac.c.FLAC13 2011-12-08 19:00:26.000000000 +0100
+++ vlc-2.0.5/modules/codec/flac.c 2013-01-02 20:48:33.569532663 +0100
@@ -38,8 +38,8 @@
#include <vlc_codec.h>
#include <vlc_aout.h>
-#include <stream_decoder.h>
-#include <stream_encoder.h>
+#include <FLAC/stream_decoder.h>
+#include <FLAC/stream_encoder.h>
#include <vlc_block_helper.h>
#include <vlc_bits.h>
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch:
configure.ac | 5 +++--
modules/access/Modules.am | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch ---
>From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat, 23 Feb 2013 16:39:23 +0100
Subject: [PATCH] Switch detection of smbclient from header to pkgconfig
---
configure.ac | 5 +++--
modules/access/Modules.am | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 65377ac..6c634f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1874,9 +1874,10 @@ dnl
AC_ARG_ENABLE(smb,
[AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
if test "${enable_smb}" != "no"; then
- AC_CHECK_HEADERS(libsmbclient.h,
+ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
[ VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
+ VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS])
+ VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])],
[ if test -n "${enable_smb}"; then
AC_MSG_ERROR([cannot find libsmbclient headers])
fi ])
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index ff6047e..c06c89b 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
libsdp_plugin_la_DEPENDENCIES =
libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb)
libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
if HAVE_WIN32
libaccess_smb_plugin_la_LIBADD += -lmpr
--
1.7.11.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 14 Dec 2012 22:46:58 -0000 1.51
+++ .cvsignore 8 Apr 2013 12:28:07 -0000 1.52
@@ -1 +1 @@
-vlc-2.0.5.tar.xz
+vlc-2.0.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 14 Dec 2012 22:46:58 -0000 1.59
+++ sources 8 Apr 2013 12:28:07 -0000 1.60
@@ -1 +1 @@
-4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
+b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- vlc.spec 14 Dec 2012 22:46:58 -0000 1.157
+++ vlc.spec 8 Apr 2013 12:28:07 -0000 1.158
@@ -30,13 +30,15 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.5
+Version: 2.0.6
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
+Patch1: 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
+Patch2: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -193,7 +195,10 @@
Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
+#Deprecated since F-19, can be dropped by F-21/EL-7
%{?live555date:Requires: live555date%{_isa} = %{live555date}}
+#Introduced in F-19
+%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%description core
VLC media player core components
@@ -220,12 +225,14 @@
%setup -q -n %{name}-%{version}%{?vlc_rc}
%if 0%{?rhel}
-%patch0 -p1 -b .xcb_discard
+%patch0 -p1 -b .xcb_discard
%{?_with_xcb:
sed -i -e "s|xcb >= 1.6|xcb >= 1.5|" configure configure.ac
touch -r config.h.in configure configure.ac
}
%endif
+%patch1 -p1 -b .FLAC13
+%patch2 -p1 -b .samba4
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -238,6 +245,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-silent-rules \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -336,6 +344,11 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Workaround config file provided in %%{_datadir}
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726
+mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \
+ $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample
+
%find_lang %{name}
@@ -512,6 +525,25 @@
%changelog
+* Mon Apr 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.6-1
+- Update to 2.0.6
+
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
+- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
+ config file - https://bugzilla.rpmfusion.org/2726
+
+* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-5
+- Fix samba4 detection rfbz#2659
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-4
+- Add new live555 requires
+
+* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-3
+- Rebuilt for ffmpeg/x264
+
+* Wed Jan 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-2
+- Fix build with FLAC-1.3.x
+
* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-1
- Update to 2.0.5
@@ -736,7 +768,7 @@
- Update bugfix to 20091025
- Clean dc1394 sub-package
-* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
- Update to 1.0-bugfix 20091016
- Rebuild for x264/ffmpeg
@@ -1159,7 +1191,7 @@
- Test Updated static live555 to 2007.02.22
- Clean up svn to release changes
-* Tue Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4
+* Thu Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4
- WIP changes - ld.conf is unusefull...
* Wed Mar 21 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.3
11 years, 7 months
rpms/vlc/F-18 .cvsignore, 1.51, 1.52 sources, 1.59, 1.60 vlc.spec, 1.166, 1.167
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24899/F-18
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 2.0.06
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 14 Dec 2012 22:46:57 -0000 1.51
+++ .cvsignore 8 Apr 2013 12:28:07 -0000 1.52
@@ -1 +1 @@
-vlc-2.0.5.tar.xz
+vlc-2.0.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 14 Dec 2012 22:46:57 -0000 1.59
+++ sources 8 Apr 2013 12:28:07 -0000 1.60
@@ -1 +1 @@
-4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
+b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- vlc.spec 23 Feb 2013 16:25:55 -0000 1.166
+++ vlc.spec 8 Apr 2013 12:28:07 -0000 1.167
@@ -30,8 +30,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.5
-Release: 5%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -245,6 +245,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-silent-rules \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -343,6 +344,11 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Workaround config file provided in %%{_datadir}
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726
+mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \
+ $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample
+
%find_lang %{name}
@@ -519,6 +525,13 @@
%changelog
+* Mon Apr 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.6-1
+- Update to 2.0.6
+
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
+- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
+ config file - https://bugzilla.rpmfusion.org/2726
+
* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-5
- Fix samba4 detection rfbz#2659
11 years, 7 months
rpms/vlc/EL-6 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch, NONE, 1.1 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch, NONE, 1.1 .cvsignore, 1.49, 1.50 sources, 1.57, 1.58 vlc.spec, 1.158, 1.159
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24899/EL-6
Modified Files:
.cvsignore sources vlc.spec
Added Files:
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
Log Message:
Update to 2.0.06
0001-Fix-build-with-unreleased-FLAC-1.3.x.patch:
flac.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch ---
diff -up vlc-2.0.5/modules/codec/flac.c.FLAC13 vlc-2.0.5/modules/codec/flac.c
--- vlc-2.0.5/modules/codec/flac.c.FLAC13 2011-12-08 19:00:26.000000000 +0100
+++ vlc-2.0.5/modules/codec/flac.c 2013-01-02 20:48:33.569532663 +0100
@@ -38,8 +38,8 @@
#include <vlc_codec.h>
#include <vlc_aout.h>
-#include <stream_decoder.h>
-#include <stream_encoder.h>
+#include <FLAC/stream_decoder.h>
+#include <FLAC/stream_encoder.h>
#include <vlc_block_helper.h>
#include <vlc_bits.h>
0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch:
configure.ac | 5 +++--
modules/access/Modules.am | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch ---
>From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat, 23 Feb 2013 16:39:23 +0100
Subject: [PATCH] Switch detection of smbclient from header to pkgconfig
---
configure.ac | 5 +++--
modules/access/Modules.am | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 65377ac..6c634f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1874,9 +1874,10 @@ dnl
AC_ARG_ENABLE(smb,
[AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])])
if test "${enable_smb}" != "no"; then
- AC_CHECK_HEADERS(libsmbclient.h,
+ PKG_CHECK_MODULES(SMBCLIENT, smbclient,
[ VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ],
+ VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS])
+ VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])],
[ if test -n "${enable_smb}"; then
AC_MSG_ERROR([cannot find libsmbclient headers])
fi ])
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index ff6047e..c06c89b 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD)
libsdp_plugin_la_DEPENDENCIES =
libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb)
libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
if HAVE_WIN32
libaccess_smb_plugin_la_LIBADD += -lmpr
--
1.7.11.7
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 21 Jul 2012 12:19:55 -0000 1.49
+++ .cvsignore 8 Apr 2013 12:28:07 -0000 1.50
@@ -1 +1 @@
-vlc-2.0.3.tar.xz
+vlc-2.0.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 21 Jul 2012 12:19:55 -0000 1.57
+++ sources 8 Apr 2013 12:28:07 -0000 1.58
@@ -1 +1 @@
-a7e79565e3df07dcf9abc6cad3ac26bb vlc-2.0.3.tar.xz
+b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/vlc.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- vlc.spec 21 Jul 2012 12:19:55 -0000 1.158
+++ vlc.spec 8 Apr 2013 12:28:07 -0000 1.159
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -18,7 +18,7 @@
%global _with_xcb 1
%endif
%if 0%{?fedora}
-%global _with_fluidsyth 1
+%global _with_fluidsynth 1
%global _with_bluray 1
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -30,13 +30,15 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.3
+Version: 2.0.6
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
+Patch1: 0001-Fix-build-with-unreleased-FLAC-1.3.x.patch
+Patch2: 0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -120,6 +122,7 @@
BuildRequires: ncurses-devel
%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
+Buildrequires: opus-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
@@ -127,7 +130,7 @@
%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
BuildRequires: sqlite-devel
BuildRequires: SDL_image-devel
-%{?_with_sidplay:BuildRequires: sidplay-libs-devel}
+%{?_with_sidplay:BuildRequires: pkgconfig(libsidplay2)}
BuildRequires: speex-devel >= 1.1.5
BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel}
@@ -147,6 +150,7 @@
%{?_with_xcb:
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
+BuildRequires: pkgconfig(xcb-keysyms)
}
BuildRequires: xorg-x11-proto-devel
@@ -191,7 +195,10 @@
Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
+#Deprecated since F-19, can be dropped by F-21/EL-7
%{?live555date:Requires: live555date%{_isa} = %{live555date}}
+#Introduced in F-19
+%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%description core
VLC media player core components
@@ -218,12 +225,14 @@
%setup -q -n %{name}-%{version}%{?vlc_rc}
%if 0%{?rhel}
-%patch0 -p1 -b .xcb_discard
+%patch0 -p1 -b .xcb_discard
%{?_with_xcb:
sed -i -e "s|xcb >= 1.6|xcb >= 1.5|" configure configure.ac
touch -r config.h.in configure configure.ac
}
%endif
+%patch1 -p1 -b .FLAC13
+%patch2 -p1 -b .samba4
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -236,6 +245,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-silent-rules \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -334,6 +344,11 @@
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Workaround config file provided in %%{_datadir}
+#https://bugzilla.rpmfusion.org/show_bug.cgi?id=2726
+mv $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/.hosts \
+ $RPM_BUILD_ROOT%{_datadir}/vlc/lua/http/hosts-sample
+
%find_lang %{name}
@@ -510,6 +525,46 @@
%changelog
+* Mon Apr 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.6-1
+- Update to 2.0.6
+
+* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
+- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
+ config file - https://bugzilla.rpmfusion.org/2726
+
+* Sat Feb 23 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-5
+- Fix samba4 detection rfbz#2659
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-4
+- Add new live555 requires
+
+* Sun Jan 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-3
+- Rebuilt for ffmpeg/x264
+
+* Wed Jan 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-2
+- Fix build with FLAC-1.3.x
+
+* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-1
+- Update to 2.0.5
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-3
+- Fix build with kernel-3.7
+
+* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-2
+- Rebuilt for x264
+
+* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-1
+- Update to 2.0.4
+- Enable opus
+- Disable x86 loader
+- Avoid rpath
+
+* Wed Sep 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-3
+- Fix --with fluidsynth typo
+
+* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-2
+- Rebuilt for x264 ABI 125
+
* Fri Jul 20 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.3-1
- Update to 2.0.3
@@ -713,7 +768,7 @@
- Update bugfix to 20091025
- Clean dc1394 sub-package
-* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
+* Fri Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
- Update to 1.0-bugfix 20091016
- Rebuild for x264/ffmpeg
@@ -1136,7 +1191,7 @@
- Test Updated static live555 to 2007.02.22
- Clean up svn to release changes
-* Tue Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4
+* Thu Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4
- WIP changes - ld.conf is unusefull...
* Wed Mar 21 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.3
11 years, 7 months
rpms/vlc/F-19 .cvsignore, 1.51, 1.52 sources, 1.59, 1.60 vlc.spec, 1.174, 1.175
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21795/F-19
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 2.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore 14 Dec 2012 22:46:57 -0000 1.51
+++ .cvsignore 8 Apr 2013 11:14:34 -0000 1.52
@@ -1 +1 @@
-vlc-2.0.5.tar.xz
+vlc-2.0.6.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sources 14 Dec 2012 22:46:57 -0000 1.59
+++ sources 8 Apr 2013 11:14:34 -0000 1.60
@@ -1 +1 @@
-4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
+b45be633c71dca04ca7d6c3d64dd728b vlc-2.0.6.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-19/vlc.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- vlc.spec 26 Mar 2013 20:52:12 -0000 1.174
+++ vlc.spec 8 Apr 2013 11:14:34 -0000 1.175
@@ -30,8 +30,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.5
-Release: 6%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -245,6 +245,7 @@
%configure \
--disable-dependency-tracking \
+ --disable-silent-rules \
--with-pic \
--disable-rpath \
--with-binary-version=%{version} \
@@ -524,6 +525,9 @@
%changelog
+* Mon Apr 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.6-1
+- Update to 2.0.6
+
* Tue Mar 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-6
- Move %%{_datadir}/vlc/lua/http/.hosts to hosts-sample to avoid
config file - https://bugzilla.rpmfusion.org/2726
11 years, 7 months
rpms/frogatto/F-19 .cvsignore, 1.6, 1.7 frogatto-1.2-Makefile.patch, 1.1, 1.2 frogatto.spec, 1.10, 1.11 sources, 1.6, 1.7 frogatto-1.0.3-yugiohjcj.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/frogatto/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19438
Modified Files:
.cvsignore frogatto-1.2-Makefile.patch frogatto.spec sources
Removed Files:
frogatto-1.0.3-yugiohjcj.patch
Log Message:
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
- Rebase to upstream 1.3.1 release
- Rebuild for new boost and glew
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 25 Dec 2011 19:46:10 -0000 1.6
+++ .cvsignore 8 Apr 2013 10:40:17 -0000 1.7
@@ -1 +1 @@
-frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+1.3.1.tar.gz
frogatto-1.2-Makefile.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: frogatto-1.2-Makefile.patch
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/frogatto-1.2-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frogatto-1.2-Makefile.patch 25 Dec 2011 19:46:10 -0000 1.1
+++ frogatto-1.2-Makefile.patch 8 Apr 2013 10:40:17 -0000 1.2
@@ -1,16 +1,12 @@
-diff -durN frogatto-frogatto-64c84bf.orig/Makefile frogatto-frogatto-64c84bf/Makefile
---- frogatto-frogatto-64c84bf.orig/Makefile 2011-11-30 06:31:31.000000000 +0100
-+++ frogatto-frogatto-64c84bf/Makefile 2011-12-25 16:49:42.639667432 +0100
-@@ -9,10 +9,10 @@
- $(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
+diff -up frogatto-1.3.1/Makefile~ frogatto-1.3.1/Makefile
+--- frogatto-1.3.1/Makefile~ 2012-12-08 23:36:13.000000000 +0100
++++ frogatto-1.3.1/Makefile 2013-04-08 09:50:59.035587574 +0200
+@@ -40,7 +40,7 @@ BASE_CXXFLAGS += -g -fno-inline-function
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
- game: $(objects)
-- $(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
-+ $(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
+ # Linker library options.
+-LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
++LIBS := $(shell pkg-config --libs x11 ) \
+ $(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
- server: $(server_objects)
-- $(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-+ $(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-
- formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex
+ include Makefile.common
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/frogatto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- frogatto.spec 1 Nov 2012 19:28:22 -0000 1.10
+++ frogatto.spec 8 Apr 2013 10:40:17 -0000 1.11
@@ -1,26 +1,19 @@
Name: frogatto
-Version: 1.2
-Release: 4%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: An old-school 2D platform game
Group: Amusements/Games
# Artwork and music not released under an open license
License: GPLv3+ and proprietary
URL: http://www.frogatto.com/
-# You can get this tarball from:
-# https://github.com/frogatto/frogatto/tarball/1.2
-Source0: frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+Source0: https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
Source1: %{name}.sh
Source2: %{name}.desktop
Source3: %{name}.xpm
Source4: %{name}.pod
# Patch Makefile not to link lSDLmain
Patch0: %{name}-1.2-Makefile.patch
-# Add joystick support for
-# Microsoft X-Box 360 pad and Microsoft SideWinder Game Pad USB
-# http://yugiohjcj.1s.fr/
-Patch1: %{name}-1.0.3-yugiohjcj.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel
@@ -47,21 +40,19 @@
%prep
-%setup -q -n %{name}-%{name}-64c84bf
+%setup -q
%patch0 -p1
-%patch1 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
%build
-make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags} \
+ BASE_CXXFLAGS="$RPM_OPT_FLAGS -fno-inline-functions -fthreadsafe-statics"
%install
-rm -rf $RPM_BUILD_ROOT
-
# Install wrapper script
install -d %{buildroot}%{_bindir}
install -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
@@ -69,13 +60,15 @@
# Install game and data
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 -p game %{buildroot}%{_libexecdir}/%{name}
-install -d %{buildroot}%{_datadir}/%{name}
-cp -pr data images music sounds \
+install -d %{buildroot}%{_datadir}/%{name}/modules/%{name}
+cp -pr data images music *.cfg \
%{buildroot}%{_datadir}/%{name}
-
-# Install translations
-install -d %{buildroot}%{_datadir}/locale
-cp -pr locale %{buildroot}%{_datadir}
+pushd modules/%{name}
+cp -pr data images music sounds *.cfg \
+ %{buildroot}%{_datadir}/%{name}/modules/%{name}
+ # Install translations
+ cp -pr locale %{buildroot}%{_datadir}
+popd
# Install desktop file
install -d %{buildroot}%{_datadir}/applications
@@ -98,10 +91,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -118,17 +107,20 @@
%files -f %{name}.lang
-%defattr(-,root,root,-)
+%doc modules/%{name}/CHANGELOG LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.6*
-%doc CHANGELOG LICENSE
%changelog
+* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
+- Rebase to upstream 1.3.1 release
+- Rebuild for new boost and glew
+
* Thu Nov 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2-4
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 25 Dec 2011 19:46:10 -0000 1.6
+++ sources 8 Apr 2013 10:40:17 -0000 1.7
@@ -1 +1 @@
-b60924f384e04728eb6e76cdd48ab8f9 frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+f3206fbe1395ea2878092fbd4ed2c591 1.3.1.tar.gz
--- frogatto-1.0.3-yugiohjcj.patch DELETED ---
11 years, 7 months
rpms/frogatto/devel .cvsignore, 1.6, 1.7 frogatto-1.2-Makefile.patch, 1.1, 1.2 frogatto.spec, 1.10, 1.11 sources, 1.6, 1.7 frogatto-1.0.3-yugiohjcj.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/frogatto/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17662
Modified Files:
.cvsignore frogatto-1.2-Makefile.patch frogatto.spec sources
Removed Files:
frogatto-1.0.3-yugiohjcj.patch
Log Message:
* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
- Rebase to upstream 1.3.1 release
- Rebuild for new boost and glew
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 25 Dec 2011 19:46:10 -0000 1.6
+++ .cvsignore 8 Apr 2013 10:25:26 -0000 1.7
@@ -1 +1 @@
-frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+1.3.1.tar.gz
frogatto-1.2-Makefile.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: frogatto-1.2-Makefile.patch
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto-1.2-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frogatto-1.2-Makefile.patch 25 Dec 2011 19:46:10 -0000 1.1
+++ frogatto-1.2-Makefile.patch 8 Apr 2013 10:25:26 -0000 1.2
@@ -1,16 +1,12 @@
-diff -durN frogatto-frogatto-64c84bf.orig/Makefile frogatto-frogatto-64c84bf/Makefile
---- frogatto-frogatto-64c84bf.orig/Makefile 2011-11-30 06:31:31.000000000 +0100
-+++ frogatto-frogatto-64c84bf/Makefile 2011-12-25 16:49:42.639667432 +0100
-@@ -9,10 +9,10 @@
- $(CXX) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics -c $<
+diff -up frogatto-1.3.1/Makefile~ frogatto-1.3.1/Makefile
+--- frogatto-1.3.1/Makefile~ 2012-12-08 23:36:13.000000000 +0100
++++ frogatto-1.3.1/Makefile 2013-04-08 09:50:59.035587574 +0200
+@@ -40,7 +40,7 @@ BASE_CXXFLAGS += -g -fno-inline-function
+ INC := $(shell pkg-config --cflags x11 sdl glu glew SDL_image libpng zlib)
- game: $(objects)
-- $(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
-+ $(CXX) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
+ # Linker library options.
+-LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
++LIBS := $(shell pkg-config --libs x11 ) \
+ $(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
- server: $(server_objects)
-- $(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-+ $(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Wreturn-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
-
- formula_test: $(formula_test_objects)
- $(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Wreturn-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex
+ include Makefile.common
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- frogatto.spec 1 Nov 2012 19:28:22 -0000 1.10
+++ frogatto.spec 8 Apr 2013 10:25:26 -0000 1.11
@@ -1,26 +1,19 @@
Name: frogatto
-Version: 1.2
-Release: 4%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: An old-school 2D platform game
Group: Amusements/Games
# Artwork and music not released under an open license
License: GPLv3+ and proprietary
URL: http://www.frogatto.com/
-# You can get this tarball from:
-# https://github.com/frogatto/frogatto/tarball/1.2
-Source0: frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+Source0: https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
Source1: %{name}.sh
Source2: %{name}.desktop
Source3: %{name}.xpm
Source4: %{name}.pod
# Patch Makefile not to link lSDLmain
Patch0: %{name}-1.2-Makefile.patch
-# Add joystick support for
-# Microsoft X-Box 360 pad and Microsoft SideWinder Game Pad USB
-# http://yugiohjcj.1s.fr/
-Patch1: %{name}-1.0.3-yugiohjcj.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel
@@ -47,21 +40,19 @@
%prep
-%setup -q -n %{name}-%{name}-64c84bf
+%setup -q
%patch0 -p1
-%patch1 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
%build
-make OPT="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make %{?_smp_mflags} \
+ BASE_CXXFLAGS="$RPM_OPT_FLAGS -fno-inline-functions -fthreadsafe-statics"
%install
-rm -rf $RPM_BUILD_ROOT
-
# Install wrapper script
install -d %{buildroot}%{_bindir}
install -m 755 -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
@@ -69,13 +60,15 @@
# Install game and data
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 -p game %{buildroot}%{_libexecdir}/%{name}
-install -d %{buildroot}%{_datadir}/%{name}
-cp -pr data images music sounds \
+install -d %{buildroot}%{_datadir}/%{name}/modules/%{name}
+cp -pr data images music *.cfg \
%{buildroot}%{_datadir}/%{name}
-
-# Install translations
-install -d %{buildroot}%{_datadir}/locale
-cp -pr locale %{buildroot}%{_datadir}
+pushd modules/%{name}
+cp -pr data images music sounds *.cfg \
+ %{buildroot}%{_datadir}/%{name}/modules/%{name}
+ # Install translations
+ cp -pr locale %{buildroot}%{_datadir}
+popd
# Install desktop file
install -d %{buildroot}%{_datadir}/applications
@@ -98,10 +91,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -118,17 +107,20 @@
%files -f %{name}.lang
-%defattr(-,root,root,-)
+%doc modules/%{name}/CHANGELOG LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.6*
-%doc CHANGELOG LICENSE
%changelog
+* Mon Apr 8 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-1
+- Rebase to upstream 1.3.1 release
+- Rebuild for new boost and glew
+
* Thu Nov 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2-4
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 25 Dec 2011 19:46:10 -0000 1.6
+++ sources 8 Apr 2013 10:25:26 -0000 1.7
@@ -1 +1 @@
-b60924f384e04728eb6e76cdd48ab8f9 frogatto-frogatto-1.2-0-g07a33cd.tar.gz
+f3206fbe1395ea2878092fbd4ed2c591 1.3.1.tar.gz
--- frogatto-1.0.3-yugiohjcj.patch DELETED ---
11 years, 7 months
rpms/dvdstyler/devel dvdstyler.spec,1.32,1.33
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7897
Modified Files:
dvdstyler.spec
Log Message:
clean typo ,
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- dvdstyler.spec 8 Apr 2013 00:56:09 -0000 1.32
+++ dvdstyler.spec 8 Apr 2013 03:22:11 -0000 1.33
@@ -12,7 +12,7 @@
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
Patch0: dvdstyler-make-desktopfile-valid.patch
# build
-BuildRequires: automake, autoconf
+BuildRequires: automake autoconf
BuildRequires: gettext
BuildRequires: byacc
# libraries
11 years, 7 months
rpms/dvdstyler/F-19 dvdstyler.spec,1.33,1.34
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7822
Modified Files:
dvdstyler.spec
Log Message:
clean typo ,
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-19/dvdstyler.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- dvdstyler.spec 8 Apr 2013 01:11:07 -0000 1.33
+++ dvdstyler.spec 8 Apr 2013 03:21:14 -0000 1.34
@@ -12,7 +12,7 @@
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}...
Patch0: dvdstyler-make-desktopfile-valid.patch
# build
-BuildRequires: automake, autoconf
+BuildRequires: automake autoconf
BuildRequires: gettext
BuildRequires: byacc
# libraries
11 years, 7 months
