rpms/dvbcut/F-14 dvbcut-svn170-fix-help-install-path.patch, NONE, 1.1 dvbcut-svn170-fix-make-install.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 dvbcut.spec, 1.11, 1.12 sources, 1.4, 1.5 dvbcut.logo.16x16.png, 1.1, NONE dvbcut.logo.24x24.png, 1.1, NONE dvbcut.logo.48x48.png, 1.1, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/dvbcut/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5052
Modified Files:
.cvsignore dvbcut.spec sources
Added Files:
dvbcut-svn170-fix-help-install-path.patch
dvbcut-svn170-fix-make-install.patch
Removed Files:
dvbcut.logo.16x16.png dvbcut.logo.24x24.png
dvbcut.logo.48x48.png
Log Message:
fix Makefile.in to place files into standard locations
fix src/Makefile to place online help in standard location
del old icons
package new icon and mime info files
adjust configure/make/install to suit fixed Makefile.in
update to svn170 to pull in gcc-4.5 patches
dvbcut-svn170-fix-help-install-path.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE dvbcut-svn170-fix-help-install-path.patch ---
--- src/Makefile.in.orig 2011-03-17 23:18:19.246863276 +1100
+++ src/Makefile.in 2011-03-17 23:20:45.059061716 +1100
@@ -28,7 +28,7 @@
datadir = @datadir@
mandir = @mandir@
man1dir = $(mandir)/man1
-helpdir = $(prefix)/share/help
+helpdir = $(datadir)/dvbcut
installdirs = $(DESTDIR)$(bindir) $(DESTDIR)$(helpdir)
dvbcut-svn170-fix-make-install.patch:
makefile.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE dvbcut-svn170-fix-make-install.patch ---
--- makefile.in.orig 2011-03-16 23:04:06.364941975 +1100
+++ makefile.in 2011-03-16 23:08:32.197955984 +1100
@@ -29,9 +29,9 @@
pkgdatadir = $(datadir)/dvbcut
installdirs = $(DESTDIR)$(man1dir) \
- $(DESTDIR)$(pkgdatadir)/icons \
- $(DESTDIR)/usr/share/applications \
- $(DESTDIR)/usr/share/mime/packages
+ $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps \
+ $(DESTDIR)$(datadir)/applications \
+ $(DESTDIR)$(datadir)/mime/packages
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -46,10 +46,9 @@
dep-local:
install-local: $(installdirs) dvbcut.1 dvbcut.desktop dvbcut.xml
$(INSTALL_DATA) dvbcut.1 $(DESTDIR)$(man1dir)/dvbcut.1
- $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)/usr/share/applications
- $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(pkgdatadir)/icons
- $(INSTALL_DATA) dvbcut.xml $(DESTDIR)/usr/share/mime/packages
- -update-mime-database $(DESTDIR)/usr/share/mime
+ $(INSTALL_DATA) dvbcut.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps
+ $(INSTALL_DATA) dvbcut.desktop $(DESTDIR)$(datadir)/applications
+ $(INSTALL_DATA) dvbcut.xml $(DESTDIR)$(datadir)/mime/packages
$(installdirs):
$(SHELL) $(top_srcdir)/mkinstalldirs $@
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 26 Oct 2009 12:32:29 -0000 1.4
+++ .cvsignore 17 Mar 2011 13:10:50 -0000 1.5
@@ -1 +1 @@
-dvbcut-svn166.tar.bz2
+dvbcut-svn170.tar.bz2
Index: dvbcut.spec
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/dvbcut.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvbcut.spec 26 Oct 2009 12:36:03 -0000 1.11
+++ dvbcut.spec 17 Mar 2011 13:10:50 -0000 1.12
@@ -1,4 +1,4 @@
-%define svnrev 166
+%define svnrev 170
%if 0%{?fedora} > 6
%define qt3 qt3
%else
@@ -7,7 +7,7 @@
Name: dvbcut
Version: 0.6.0
-Release: 10.svn%{svnrev}%{?dist}
+Release: 12.svn%{svnrev}%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
@@ -17,17 +17,14 @@
#Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_%{version}.tar.bz2
# use sh dvbcut-snapshot.sh to create the archive
Source0: %{name}-svn%{svnrev}.tar.bz2
-# Since no icons have been developed by the project, created icons using the
-# weblogo on the home page. Scaled and text pixel edited using gimp.
-Source1: %{name}.logo.16x16.png
-Source2: %{name}.logo.24x24.png
-Source3: %{name}.logo.48x48.png
# This desktop file was created by hand.
Source4: %{name}.desktop
Source5: %{name}-snapshot.sh
Source6: %{name}-servicemenu.desktop
-# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut
+# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead
Patch0: %{name}-fix-help-path.patch
+Patch1: %{name}-svn170-fix-make-install.patch
+Patch2: %{name}-svn170-fix-help-install-path.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
@@ -56,12 +53,12 @@
%prep
%setup -q -n %{name}-svn%{svnrev}
%patch0 -b .fix-help-path
-
+%patch1 -b .fix-make-install
+%patch2 -b .fix-help-install
# Fix QTDIR libs in configure
sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
-
# Avoid stripping binaries
sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in
@@ -75,27 +72,14 @@
autoconf
%configure --with-ffmpeg=%{_prefix} \
--with-ffmpeg-include=%{_includedir}/ffmpeg/
+ helpdir=%{_datadir}/%{name}
+
# It does not compile with smp_mflags
make
%install
-rm -rf %{buildroot}
-make install \
- bindir=%{buildroot}%{_bindir} \
- helpdir=%{buildroot}%{_datadir}/%{name} \
- mandir=%{buildroot}%{_mandir}
-
-# manual install of icons
-for iconsize in 16x16 24x24 48x48; do
- mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$iconsize/apps/
-done
-install -p -m 644 %{SOURCE1} \
- %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 %{SOURCE2} \
- %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
-install -p -m 644 %{SOURCE3} \
- %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor="" \
@@ -135,13 +119,24 @@
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/%{name}/dvbcut_*.html
%{_kde4_datadir}/kde4/services/*.desktop
+%{_datadir}/mime/packages/dvbcut.xml
%changelog
-* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166
+* Thu Mar 17 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-12.svn170
+- fix Makefile.in to place files into standard locations
+- fix src/Makefile to place online help in standard location
+- del old icons
+- package new icon and mime info files
+- adjust configure/make/install to suit fixed Makefile.in
+
+* Fri Feb 11 2011 David Timms <iinet.net.au at dtimms> - 0.6.0-11.svn170
+- update to svn170 to pull in gcc-4.5 patches
+
+* Mon Oct 26 2009 David Timms <iinet.net.au at dtimms> - 0.6.0-10.svn166
- update to svn166
- drop upstreamed gcc44 patch
- add mpg mimetype to gnome desktop to provide mpeg open with in nautilus
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvbcut/F-14/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 26 Oct 2009 12:32:29 -0000 1.4
+++ sources 17 Mar 2011 13:10:50 -0000 1.5
@@ -1 +1 @@
-9f7f4aaf61cf236422c07aa8d8617126 dvbcut-svn166.tar.bz2
+321b6be72ea7186a383274a2eae2eddb dvbcut-svn170.tar.bz2
13 years, 1 month
rpms/lightspark/F-14 lightspark.spec,1.11,1.12 sources,1.9,1.10
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/lightspark/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31637/F-14
Modified Files:
lightspark.spec sources
Log Message:
Update to 0.4.6 final
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-14/lightspark.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lightspark.spec 13 Mar 2011 19:24:00 -0000 1.11
+++ lightspark.spec 16 Mar 2011 11:39:56 -0000 1.12
@@ -1,6 +1,6 @@
%define debug 0
-%define git 1
+%define git 0
%if %{git}
%define git_snapshot 1
@@ -17,12 +17,12 @@
%define pre rc1
%endif
-%define rel 0.1
+%define rel 1
%define major 0.4.6
Name: lightspark
-Version: %{major}.0
+Version: %{major}
Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
@@ -154,6 +154,9 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Wed Mar 16 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6-1
+- Update to 0.4.6 final
+
* Sun Mar 13 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6.0-0.1.20110313git
- New snapshot, fixes buttons display on youtube
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-14/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 13 Mar 2011 19:24:00 -0000 1.9
+++ sources 16 Mar 2011 11:39:56 -0000 1.10
@@ -1 +1 @@
-885ae97f5dc5c961f9c8b013db756a87 lightspark-0.4.6.0-20110313git.tar.bz2
+204757c2467d4e8718d5313edc84e8e5 lightspark-0.4.6.tar.gz
13 years, 1 month
rpms/lightspark/devel lightspark.spec,1.13,1.14 sources,1.12,1.13
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/lightspark/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31327/devel
Modified Files:
lightspark.spec sources
Log Message:
Update to 0.4.6 final
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/lightspark.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lightspark.spec 13 Mar 2011 19:21:07 -0000 1.13
+++ lightspark.spec 16 Mar 2011 11:38:22 -0000 1.14
@@ -1,6 +1,6 @@
%define debug 0
-%define git 1
+%define git 0
%if %{git}
%define git_snapshot 1
@@ -17,12 +17,12 @@
%define pre rc1
%endif
-%define rel 0.1
+%define rel 1
%define major 0.4.6
Name: lightspark
-Version: %{major}.0
+Version: %{major}
Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
@@ -154,6 +154,9 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Wed Mar 16 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6-1
+- Update to 0.4.6 final
+
* Sun Mar 13 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6.0-0.1.20110313git
- New snapshot, fixes buttons display on youtube
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 13 Mar 2011 19:21:08 -0000 1.12
+++ sources 16 Mar 2011 11:38:22 -0000 1.13
@@ -1 +1 @@
-885ae97f5dc5c961f9c8b013db756a87 lightspark-0.4.6.0-20110313git.tar.bz2
+204757c2467d4e8718d5313edc84e8e5 lightspark-0.4.6.tar.gz
13 years, 1 month
rpms/ufoai/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ufoai-wrapper.sh, 1.1, 1.2 ufoai.spec, 1.6, 1.7 ufoai-2.3-libdir.patch, 1.1, NONE
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14440
Modified Files:
.cvsignore sources ufoai-wrapper.sh ufoai.spec
Removed Files:
ufoai-2.3-libdir.patch
Log Message:
* Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
- Version bump
- Fixes RPMFusion bug #1546
- See the release annoucement for list of changes:
http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_...
- .spec cleanup
- Adds workaround for crash on Intel cards
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Sep 2010 13:15:45 -0000 1.3
+++ .cvsignore 14 Mar 2011 14:13:50 -0000 1.4
@@ -1 +1 @@
-ufoai-2.3-source.tar.bz2
+ufoai-2.3.1-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 14 Sep 2010 13:15:45 -0000 1.3
+++ sources 14 Mar 2011 14:13:51 -0000 1.4
@@ -1 +1 @@
-9d180ed896a58fe0e514601cd7637dc1 ufoai-2.3-source.tar.bz2
+87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2
Index: ufoai-wrapper.sh
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufoai-wrapper.sh 14 Sep 2010 13:15:45 -0000 1.1
+++ ufoai-wrapper.sh 14 Mar 2011 14:13:52 -0000 1.2
@@ -4,6 +4,21 @@
checkDriOK UFO:AI
+confdir="$HOME/.ufoai/2.3.1/base"
+conffile="$confdir/config.cfg"
+
+if glxinfo | grep "renderer string" | grep Intel &> /dev/null ; then
+ if [ -f $conffile ]; then
+ if grep r_programs $conffile | grep 1 &> /dev/null ; then
+ zenity --warning --text "You have GLSL Shaders enabled in your ufoai configuration file while using Intel OpenGL driver. This is known to crash the game or the X Server. It is highly recommended to turn the option off (Options => Video => GLSL Shaders)."
+ fi
+ else
+ mkdir -p $confdir
+ echo 'set r_programs "0" a' > $conffile
+ zenity --info --text "Intel OpenGL driver detected. Disabling GLSL Shaders due to known problems (game or X Server crash)."
+ fi
+fi
+
exec ufo \
+set fs_i18ndir /usr/share/locale \
"\$@"
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ufoai.spec 14 Oct 2010 21:00:29 -0000 1.6
+++ ufoai.spec 14 Mar 2011 14:13:53 -0000 1.7
@@ -1,6 +1,6 @@
Name: ufoai
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -12,7 +12,6 @@
Patch0: ufoai-2.3-no-lua.patch
Patch1: ufoai-2.3-radiant-ldl.patch
Patch2: ufoai-2.3-desktop-files.patch
-Patch3: ufoai-2.3-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,23 +116,19 @@
%prep
%setup -q -n %{name}-%{version}-source
-# allow to set the library path
-#%patch -p1
# ufoai-2.3-no-lua.patch - disable bundled lua
%patch0 -p0
# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
-%patch1 -p0
+# need to use fuzz, the Makefile has changed since 2.3
+%patch1 -F2 -p0
# ufoai-2.3-desktop-files.patch - fix executable and icon names
%patch2 -p0
## we do not like "arch-dependent-file" in /usr/share
# change the target for the library
sed -i -e "s/base/./" build/game.mk
-# ufoai-2.3-libdir.patch - search for the library within system library path
-%patch3 -p0
%build
-#%configure --disable-ufo2map --disable-uforadiant --enable-release
%configure --enable-release
make %{?_smp_mflags}
make %{?_smp_mflags} lang
@@ -148,7 +143,7 @@
%install
rm -rf %{buildroot}
# we don't use
-# make install_exec DESTDIR=%{buildroot}
+# make install_exec DESTDIR=%%{buildroot}
# simply because it does not work ...
## client
@@ -181,8 +176,8 @@
install -D -m 0755 ufomodel %{buildroot}%{_bindir}
install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py
# not available in our sources
-#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %{buildroot}%{_sysconfdir}/bash_completion.d/ufo2map
-#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %{buildroot}%{_sysconfdir}/bash_completion.d/ufomodel
+#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map
+#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufomodel
## install uforadiant
install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant
@@ -249,7 +244,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-# we need to use full path so %doc does not the cleanup
+# we need to use full path so %%doc does not the cleanup
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/COPYING
@@ -271,7 +266,6 @@
%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
-#%doc %{_docdir}/%{name}-%{version}/*.pdf
%lang(en) %doc %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf
@@ -289,7 +283,7 @@
%{_bindir}/ufomodel
%dir %{_datadir}/%{name}/
# not available in our sources
-#%{_sysconfdir}/bash_completion.d/
+#%%{_sysconfdir}/bash_completion.d/
%doc %{_mandir}/man6/ufo2map.6*
%{_datadir}/%{name}/tools/
@@ -307,6 +301,14 @@
%changelog
+* Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
+- Version bump
+- Fixes RPMFusion bug #1546
+- See the release annoucement for list of changes:
+ http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_...
+- .spec cleanup
+- Adds workaround for crash on Intel cards
+
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-2
- Rebuilt for gcc bug
--- ufoai-2.3-libdir.patch DELETED ---
13 years, 1 month
rpms/ufoai-data/F-14 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ufoai-data.spec, 1.3, 1.4
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai-data/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13074
Modified Files:
.cvsignore sources ufoai-data.spec
Log Message:
* Sat Mar 12 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
- Version bump
- Fixes RPMFusion bug #1546
- Added city maps hotfix, see http://ufoai.ninex.info/wiki/index.php/News/2010#Hotfix_for_2.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-14/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Sep 2010 08:23:11 -0000 1.3
+++ .cvsignore 14 Mar 2011 13:59:47 -0000 1.4
@@ -1 +1,2 @@
-ufoai-2.3-data.tar
+ufoai-2.3.1-data.tar
+1maps.pk3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-14/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Sep 2010 08:23:11 -0000 1.3
+++ sources 14 Mar 2011 13:59:47 -0000 1.4
@@ -1 +1,2 @@
-08fa6d5c80231468c4d5e886600c8dcf ufoai-2.3-data.tar
+11468144bc00618c38667eec04b12a4a ufoai-2.3.1-data.tar
+0187f2169401d59423c6e01184fff90d 1maps.pk3
Index: ufoai-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/F-14/ufoai-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ufoai-data.spec 16 Sep 2010 08:23:11 -0000 1.3
+++ ufoai-data.spec 14 Mar 2011 13:59:47 -0000 1.4
@@ -1,14 +1,16 @@
%define game_name ufoai
Name: ufoai-data
-Version: 2.3
+Version: 2.3.1
Release: 1
Summary: UFO: Alien Invasion data files
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
-Source: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+Source0: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+# city maps hotfix
+Source1: http://mattn.ninex.info/1maps.pk3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,6 +46,8 @@
rm -rf %{buildroot}
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
cp -pr base %{buildroot}%{_datadir}/%{game_name}/
+# city maps hotfix
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/
%clean
@@ -68,9 +72,16 @@
%{_datadir}/%{game_name}/base/0base.pk3
%{_datadir}/%{game_name}/base/0maps.pk3
%{_datadir}/%{game_name}/base/0ufos.pk3
+# city maps hotfix
+%{_datadir}/%{game_name}/base/1maps.pk3
%changelog
+* Sat Mar 12 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
+- Version bump
+- Fixes RPMFusion bug #1546
+- Added city maps hotfix, see http://ufoai.ninex.info/wiki/index.php/News/2010#Hotfix_for_2.3.1
+
* Tue Aug 17 2010 Karel Volny <kvolny(a)redhat.com> 2.3-1
- Version bump
- Split server subpackage
13 years, 1 month
rpms/ufoai/F-14 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ufoai-wrapper.sh, 1.1, 1.2 ufoai.spec, 1.6, 1.7 ufoai-2.3-libdir.patch, 1.1, NONE
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12864
Modified Files:
.cvsignore sources ufoai-wrapper.sh ufoai.spec
Removed Files:
ufoai-2.3-libdir.patch
Log Message:
* Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
- Version bump
- Fixes RPMFusion bug #1546
- See the release annoucement for list of changes:
http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_...
- .spec cleanup
- Adds workaround for crash on Intel cards
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-14/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Sep 2010 13:15:45 -0000 1.3
+++ .cvsignore 14 Mar 2011 13:58:25 -0000 1.4
@@ -1 +1 @@
-ufoai-2.3-source.tar.bz2
+ufoai-2.3.1-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-14/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 14 Sep 2010 13:15:45 -0000 1.3
+++ sources 14 Mar 2011 13:58:25 -0000 1.4
@@ -1 +1 @@
-9d180ed896a58fe0e514601cd7637dc1 ufoai-2.3-source.tar.bz2
+87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2
Index: ufoai-wrapper.sh
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-14/ufoai-wrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufoai-wrapper.sh 14 Sep 2010 13:15:45 -0000 1.1
+++ ufoai-wrapper.sh 14 Mar 2011 13:58:27 -0000 1.2
@@ -4,6 +4,21 @@
checkDriOK UFO:AI
+confdir="$HOME/.ufoai/2.3.1/base"
+conffile="$confdir/config.cfg"
+
+if glxinfo | grep "renderer string" | grep Intel &> /dev/null ; then
+ if [ -f $conffile ]; then
+ if grep r_programs $conffile | grep 1 &> /dev/null ; then
+ zenity --warning --text "You have GLSL Shaders enabled in your ufoai configuration file while using Intel OpenGL driver. This is known to crash the game or the X Server. It is highly recommended to turn the option off (Options => Video => GLSL Shaders)."
+ fi
+ else
+ mkdir -p $confdir
+ echo 'set r_programs "0" a' > $conffile
+ zenity --info --text "Intel OpenGL driver detected. Disabling GLSL Shaders due to known problems (game or X Server crash)."
+ fi
+fi
+
exec ufo \
+set fs_i18ndir /usr/share/locale \
"\$@"
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-14/ufoai.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ufoai.spec 14 Oct 2010 21:00:29 -0000 1.6
+++ ufoai.spec 14 Mar 2011 13:58:27 -0000 1.7
@@ -1,6 +1,6 @@
Name: ufoai
-Version: 2.3
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -12,7 +12,6 @@
Patch0: ufoai-2.3-no-lua.patch
Patch1: ufoai-2.3-radiant-ldl.patch
Patch2: ufoai-2.3-desktop-files.patch
-Patch3: ufoai-2.3-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -117,23 +116,19 @@
%prep
%setup -q -n %{name}-%{version}-source
-# allow to set the library path
-#%patch -p1
# ufoai-2.3-no-lua.patch - disable bundled lua
%patch0 -p0
# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
-%patch1 -p0
+# need to use fuzz, the Makefile has changed since 2.3
+%patch1 -F2 -p0
# ufoai-2.3-desktop-files.patch - fix executable and icon names
%patch2 -p0
## we do not like "arch-dependent-file" in /usr/share
# change the target for the library
sed -i -e "s/base/./" build/game.mk
-# ufoai-2.3-libdir.patch - search for the library within system library path
-%patch3 -p0
%build
-#%configure --disable-ufo2map --disable-uforadiant --enable-release
%configure --enable-release
make %{?_smp_mflags}
make %{?_smp_mflags} lang
@@ -148,7 +143,7 @@
%install
rm -rf %{buildroot}
# we don't use
-# make install_exec DESTDIR=%{buildroot}
+# make install_exec DESTDIR=%%{buildroot}
# simply because it does not work ...
## client
@@ -181,8 +176,8 @@
install -D -m 0755 ufomodel %{buildroot}%{_bindir}
install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py
# not available in our sources
-#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %{buildroot}%{_sysconfdir}/bash_completion.d/ufo2map
-#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %{buildroot}%{_sysconfdir}/bash_completion.d/ufomodel
+#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map
+#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufomodel
## install uforadiant
install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant
@@ -249,7 +244,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-# we need to use full path so %doc does not the cleanup
+# we need to use full path so %%doc does not the cleanup
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/COPYING
@@ -271,7 +266,6 @@
%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
-#%doc %{_docdir}/%{name}-%{version}/*.pdf
%lang(en) %doc %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf
@@ -289,7 +283,7 @@
%{_bindir}/ufomodel
%dir %{_datadir}/%{name}/
# not available in our sources
-#%{_sysconfdir}/bash_completion.d/
+#%%{_sysconfdir}/bash_completion.d/
%doc %{_mandir}/man6/ufo2map.6*
%{_datadir}/%{name}/tools/
@@ -307,6 +301,14 @@
%changelog
+* Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
+- Version bump
+- Fixes RPMFusion bug #1546
+- See the release annoucement for list of changes:
+ http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_...
+- .spec cleanup
+- Adds workaround for crash on Intel cards
+
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-2
- Rebuilt for gcc bug
--- ufoai-2.3-libdir.patch DELETED ---
13 years, 1 month
rpms/lightspark/F-14 lightspark.spec,1.10,1.11 sources,1.8,1.9
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/lightspark/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30163/F-14
Modified Files:
lightspark.spec sources
Log Message:
Fix youtube buttons display
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-14/lightspark.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lightspark.spec 4 Mar 2011 22:24:18 -0000 1.10
+++ lightspark.spec 13 Mar 2011 19:24:00 -0000 1.11
@@ -9,20 +9,20 @@
%define pre_release 0
%if %{?git}
-%define commit b2eafece0d7c5c93b1c0837ed8d56d9b7e3ce022
-%define date 20110304
+%define commit 88014f93f65b4079d75ea6c7d07ff156c2c5c8dd
+%define date 20110313
%endif
%if %{pre_release}
%define pre rc1
%endif
-%define rel 1
+%define rel 0.1
-%define major 0.4.5
+%define major 0.4.6
Name: lightspark
-Version: %{major}.3
+Version: %{major}.0
Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
@@ -154,6 +154,9 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Sun Mar 13 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6.0-0.1.20110313git
+- New snapshot, fixes buttons display on youtube
+
* Fri Mar 04 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.5.3-1.20110304git
- Update to 0.4.5.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-14/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 4 Mar 2011 22:24:18 -0000 1.8
+++ sources 13 Mar 2011 19:24:00 -0000 1.9
@@ -1 +1 @@
-dc105e8ad2a5b8dd014af2106b9f2531 lightspark-0.4.5.3-20110304git.tar.bz2
+885ae97f5dc5c961f9c8b013db756a87 lightspark-0.4.6.0-20110313git.tar.bz2
13 years, 1 month
rpms/lightspark/devel lightspark.spec,1.12,1.13 sources,1.11,1.12
by Hicham HAOUARI
Author: hicham
Update of /cvs/free/rpms/lightspark/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29517/devel
Modified Files:
lightspark.spec sources
Log Message:
Fix youtube buttons display
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/lightspark.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lightspark.spec 4 Mar 2011 22:18:58 -0000 1.12
+++ lightspark.spec 13 Mar 2011 19:21:07 -0000 1.13
@@ -9,20 +9,20 @@
%define pre_release 0
%if %{?git}
-%define commit b2eafece0d7c5c93b1c0837ed8d56d9b7e3ce022
-%define date 20110304
+%define commit 88014f93f65b4079d75ea6c7d07ff156c2c5c8dd
+%define date 20110313
%endif
%if %{pre_release}
%define pre rc1
%endif
-%define rel 1
+%define rel 0.1
-%define major 0.4.5
+%define major 0.4.6
Name: lightspark
-Version: %{major}.3
+Version: %{major}.0
Release: %{?pre:0.}%{rel}%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
@@ -154,6 +154,9 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Sun Mar 13 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.6.0-0.1.20110313git
+- New snapshot, fixes buttons display on youtube
+
* Fri Mar 04 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.5.3-1.20110304git
- Update to 0.4.5.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Mar 2011 22:18:58 -0000 1.11
+++ sources 13 Mar 2011 19:21:08 -0000 1.12
@@ -1 +1 @@
-dc105e8ad2a5b8dd014af2106b9f2531 lightspark-0.4.5.3-20110304git.tar.bz2
+885ae97f5dc5c961f9c8b013db756a87 lightspark-0.4.6.0-20110313git.tar.bz2
13 years, 1 month
rpms/ufoai-data/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ufoai-data.spec, 1.3, 1.4
by Karel Volný
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai-data/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16515
Modified Files:
.cvsignore sources ufoai-data.spec
Log Message:
* Sat Mar 12 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
- Version bump
- Fixes RPMFusion bug #1546
- Added city maps hotfix, see http://ufoai.ninex.info/wiki/index.php/News/2010#Hotfix_for_2.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Sep 2010 08:23:11 -0000 1.3
+++ .cvsignore 12 Mar 2011 16:21:59 -0000 1.4
@@ -1 +1,2 @@
-ufoai-2.3-data.tar
+ufoai-2.3.1-data.tar
+1maps.pk3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Sep 2010 08:23:11 -0000 1.3
+++ sources 12 Mar 2011 16:21:59 -0000 1.4
@@ -1 +1,2 @@
-08fa6d5c80231468c4d5e886600c8dcf ufoai-2.3-data.tar
+11468144bc00618c38667eec04b12a4a ufoai-2.3.1-data.tar
+0187f2169401d59423c6e01184fff90d 1maps.pk3
Index: ufoai-data.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai-data/devel/ufoai-data.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ufoai-data.spec 16 Sep 2010 08:23:11 -0000 1.3
+++ ufoai-data.spec 12 Mar 2011 16:21:59 -0000 1.4
@@ -1,14 +1,16 @@
%define game_name ufoai
Name: ufoai-data
-Version: 2.3
+Version: 2.3.1
Release: 1
Summary: UFO: Alien Invasion data files
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
-Source: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+Source0: http://downloads.sourceforge.net/%{game_name}/%{game_name}-%{version}-dat...
+# city maps hotfix
+Source1: http://mattn.ninex.info/1maps.pk3
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,6 +46,8 @@
rm -rf %{buildroot}
mkdir -p -m 0755 %{buildroot}%{_datadir}/%{game_name}
cp -pr base %{buildroot}%{_datadir}/%{game_name}/
+# city maps hotfix
+install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/%{game_name}/base/
%clean
@@ -68,9 +72,16 @@
%{_datadir}/%{game_name}/base/0base.pk3
%{_datadir}/%{game_name}/base/0maps.pk3
%{_datadir}/%{game_name}/base/0ufos.pk3
+# city maps hotfix
+%{_datadir}/%{game_name}/base/1maps.pk3
%changelog
+* Sat Mar 12 2011 Karel Volny <kvolny(a)redhat.com> 2.3.1-1
+- Version bump
+- Fixes RPMFusion bug #1546
+- Added city maps hotfix, see http://ufoai.ninex.info/wiki/index.php/News/2010#Hotfix_for_2.3.1
+
* Tue Aug 17 2010 Karel Volny <kvolny(a)redhat.com> 2.3-1
- Version bump
- Split server subpackage
13 years, 1 month
rpms/vlc/devel vlc.spec,1.116,1.117
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17820
Modified Files:
vlc.spec
Log Message:
Remove right bump
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- vlc.spec 11 Mar 2011 08:16:36 -0000 1.116
+++ vlc.spec 11 Mar 2011 09:10:14 -0000 1.117
@@ -28,7 +28,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.8
-Release: 0.2%{?dist}.1
+Release: 0.2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
13 years, 1 month
