rpms/phonon-backend-vlc/devel phonon-backend-vlc.spec,1.20,1.21
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23550
Modified Files:
phonon-backend-vlc.spec
Log Message:
* Wed Oct 02 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-2
- rebuild (vlc)
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- phonon-backend-vlc.spec 13 Feb 2013 12:35:39 -0000 1.20
+++ phonon-backend-vlc.spec 2 Oct 2013 17:30:00 -0000 1.21
@@ -2,7 +2,7 @@
name: phonon-backend-vlc
Summary: VLC phonon backend
Version: 0.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
@@ -74,6 +74,9 @@
%changelog
+* Wed Oct 02 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-2
+- rebuild (vlc)
+
* Wed Feb 13 2013 Rex Dieter <rdieter(a)fedoraproject.org> 0.6.2-1
- 0.6.2
10 years, 7 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.111,1.112
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1754/F-19
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Sync with devel
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xorg-x11-drv-nvidia.spec 29 Sep 2013 23:00:02 -0000 1.111
+++ xorg-x11-drv-nvidia.spec 2 Oct 2013 15:53:30 -0000 1.112
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 325.15
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -56,7 +56,6 @@
Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-nvidia-173xx
-Conflicts: xorg-x11-drv-nvidia-304xx
Conflicts: xorg-x11-drv-fglrx
Conflicts: xorg-x11-drv-catalyst
@@ -224,8 +223,10 @@
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
--set-icon=nvidia-settings \
--set-key=Exec --set-value=nvidia-settings \
+%endif
nvidia-settings.desktop
#Workaround for self made xorg.conf using a Files section.
@@ -407,13 +408,13 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{_nvidia_libdir}/libcuda.so
%{_includedir}/nvidia/
%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-encode.so
%endif
+%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-ifr.so
@@ -423,19 +424,26 @@
%{_nvidia_libdir}/libnvidia-vgxcfg.so
%changelog
+* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-2
+- Avoid to exclude libcuda.so in devel
+- Drop desktop-file-install options not supported on EL6
+
* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
- Update to 325.15 release
-* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-7
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.08-5
- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
-* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-6
+* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.08-4
- Fix typo with libGLcore filter
-* Sun Jul 14 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:319.32-5
+* Sun Jul 14 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-3
- re-add man pages for settings and xconfig
-* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-4
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.08-2
+- Rebased to 325.08
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3
- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
- Add virtual provides for nvidia-modprobe/nvidia-persistenced
- Enable nvidia-persistenced systemd service
10 years, 7 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.118,1.119
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1754/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Sync with devel
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- xorg-x11-drv-nvidia.spec 29 Sep 2013 23:25:10 -0000 1.118
+++ xorg-x11-drv-nvidia.spec 2 Oct 2013 15:53:31 -0000 1.119
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 325.15
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -223,8 +223,10 @@
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
--set-icon=nvidia-settings \
--set-key=Exec --set-value=nvidia-settings \
+%endif
nvidia-settings.desktop
#Workaround for self made xorg.conf using a Files section.
@@ -406,13 +408,13 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{_nvidia_libdir}/libcuda.so
%{_includedir}/nvidia/
%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-encode.so
%endif
+%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvidia-ifr.so
@@ -422,6 +424,10 @@
%{_nvidia_libdir}/libnvidia-vgxcfg.so
%changelog
+* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.15-2
+- Avoid to exclude libcuda.so in devel
+- Drop desktop-file-install options not supported on EL6
+
* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.15-1
- Update to 325.15 release
10 years, 7 months
rpms/frogatto/F-19 frogatto-1.3-no-boost-mt.patch,NONE,1.1
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/frogatto/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29305
Added Files:
frogatto-1.3-no-boost-mt.patch
Log Message:
* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
- Updated to upstream v1.3.3 as of Aug 21, 2013
- Fixed crash when attempting to enter in editor mode (#2966)
- Used Mac OS X icons
- Removed Group tag
frogatto-1.3-no-boost-mt.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE frogatto-1.3-no-boost-mt.patch ---
diff -up frogatto-1.3.1/Makefile~ frogatto-1.3.1/Makefile
--- frogatto-1.3.1/Makefile~ 2013-08-26 20:05:43.000000000 +0200
+++ frogatto-1.3.1/Makefile 2013-08-26 20:11:04.507451694 +0200
@@ -60,7 +60,7 @@ game: $(objects)
$(CCACHE) $(CXX) \
$(BASE_CXXFLAGS) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(INC) \
$(objects) -o game \
- $(LIBS) -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
+ $(LIBS) -lboost_regex -lboost_system -lpthread -fthreadsafe-statics
# pull in dependency info for *existing* .o files
-include $(objects:.o=.d)
10 years, 7 months
rpms/frogatto/F-19 frogatto-1.3-fonts.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 frogatto.spec, 1.12, 1.13 sources, 1.7, 1.8 frogatto.xpm, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/frogatto/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28397
Modified Files:
.cvsignore frogatto.spec sources
Added Files:
frogatto-1.3-fonts.patch
Removed Files:
frogatto.xpm
Log Message:
* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
- Updated to upstream v1.3.3 as of Aug 21, 2013
- Fixed crash when attempting to enter in editor mode (#2966)
- Used Mac OS X icons
- Removed Group tag
frogatto-1.3-fonts.patch:
font.cpp | 2 +-
vector_text.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE frogatto-1.3-fonts.patch ---
Description: Use FreeFont instead of the Ubuntu Font Family
Use the FreeFont instead of Ubuntu one, as the later one is not
compatible with DFSG (see e.g. #603157). This also fixes an issue
in loading the editor, as a relative path was hardcoded then.
Forwarded: no
Author: Martin Quinson <mquinson(a)debian.org>
Last-Update: 2013-01-26
Index: frogatto/src/font.cpp
===================================================================
--- frogatto.orig/src/font.cpp 2013-01-12 20:49:22.049472442 +0100
+++ frogatto/src/font.cpp 2013-01-26 22:44:45.390874240 +0100
@@ -20,7 +20,7 @@
#endif
namespace {
-const char* FontFile = "UbuntuMono-R.ttf";
+const char* FontFile = "/usr/share/fonts/gnu-free/FreeMono.ttf";
std::map<int, TTF_Font*> font_table;
Index: frogatto/src/vector_text.cpp
===================================================================
--- frogatto.orig/src/vector_text.cpp 2013-01-12 20:49:22.125473580 +0100
+++ frogatto/src/vector_text.cpp 2013-01-26 22:45:35.918522864 +0100
@@ -13,7 +13,7 @@
: text_(i18n::tr(node["text"].as_string())),
visible_(node["visible"].as_bool(true)),
size_(node["size"].as_int(12)),
- font_(node["font"].as_string_default("UbuntuMono-R"))
+ font_(node["font"].as_string_default("FreeMono"))
{
std::vector<int> r = node["rect"].as_list_int();
draw_area_ = rect(r[0], r[1], r[2], r[3]);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 8 Apr 2013 10:40:17 -0000 1.7
+++ .cvsignore 2 Oct 2013 15:10:28 -0000 1.8
@@ -1 +1 @@
-1.3.1.tar.gz
+frogatto-1.3.3-a7ef3bf.tar.gz
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/frogatto.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- frogatto.spec 8 Apr 2013 17:53:14 -0000 1.12
+++ frogatto.spec 2 Oct 2013 15:10:28 -0000 1.13
@@ -1,19 +1,24 @@
+%global commit a7ef3bfa0c32df4852bf057fab969c1a080edf4d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: frogatto
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.3
+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/
-Source0: https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
+Source0: https://github.com/frogatto/frogatto/archive/%{commit}/%{name}-%{version}...
Source1: %{name}.sh
Source2: %{name}.desktop
-Source3: %{name}.xpm
-Source4: %{name}.pod
+Source3: %{name}.pod
# Patch Makefile not to link lSDLmain
Patch0: %{name}-1.2-Makefile.patch
+# Boost no longer has separate non mt and -mt variants of its libs
+Patch1: %{name}-1.3-no-boost-mt.patch
+# Use FreeFont instead of the Ubuntu Font Family
+Patch2: %{name}-1.3-fonts.patch
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel
@@ -25,6 +30,8 @@
BuildRequires: ccache
BuildRequires: boost-devel
BuildRequires: perl-podlators
+BuildRequires: gnu-free-mono-fonts
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -40,8 +47,10 @@
%prep
-%setup -q
+%setup -qn %{name}-%{commit}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
@@ -64,8 +73,8 @@
cp -pr data images music *.cfg \
%{buildroot}%{_datadir}/%{name}
pushd modules/%{name}
-cp -pr data images music sounds *.cfg \
- %{buildroot}%{_datadir}/%{name}/modules/%{name}
+ cp -pr data images music sounds *.cfg \
+ %{buildroot}%{_datadir}/%{name}/modules/%{name}
# Install translations
cp -pr locale %{buildroot}%{_datadir}
popd
@@ -76,9 +85,15 @@
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
-# Install icon
-install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Extract Mac OS X icons
+icns2png -x modules/%{name}/images/os/mac/icon.icns
+
+# Install icons
+for i in 16 32 128 256; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 icon_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
# Install man page
install -d %{buildroot}%{_mandir}/man6
@@ -86,7 +101,7 @@
-center="RPM Fusion contributed man pages" \
-release="%{name} %{version}" \
-date="July 13th, 2010" \
- %{SOURCE4} > %{buildroot}%{_mandir}/man6/%{name}.6
+ %{SOURCE3} > %{buildroot}%{_mandir}/man6/%{name}.6
%find_lang %{name}
@@ -111,12 +126,21 @@
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.6*
%changelog
+* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
+- Updated to upstream v1.3.3 as of Aug 21, 2013
+- Fixed crash when attempting to enter in editor mode (#2966)
+- Used Mac OS X icons
+- Removed Group tag
+
+* Mon Aug 26 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-3
+- Rebuild for new boost
+
* 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: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/F-19/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 8 Apr 2013 10:40:17 -0000 1.7
+++ sources 2 Oct 2013 15:10:28 -0000 1.8
@@ -1 +1 @@
-f3206fbe1395ea2878092fbd4ed2c591 1.3.1.tar.gz
+d5b56bb9a6fa6bf6506e68a928fcc858 frogatto-1.3.3-a7ef3bf.tar.gz
--- frogatto.xpm DELETED ---
10 years, 7 months
rpms/frogatto/devel frogatto-1.3-fonts.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 frogatto.spec, 1.13, 1.14 sources, 1.7, 1.8 frogatto.xpm, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/frogatto/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28165
Modified Files:
.cvsignore frogatto.spec sources
Added Files:
frogatto-1.3-fonts.patch
Removed Files:
frogatto.xpm
Log Message:
* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
- Updated to upstream v1.3.3 as of Aug 21, 2013
- Fixed crash when attempting to enter in editor mode (#2966)
- Used Mac OS X icons
- Removed Group tag
frogatto-1.3-fonts.patch:
font.cpp | 2 +-
vector_text.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE frogatto-1.3-fonts.patch ---
Description: Use FreeFont instead of the Ubuntu Font Family
Use the FreeFont instead of Ubuntu one, as the later one is not
compatible with DFSG (see e.g. #603157). This also fixes an issue
in loading the editor, as a relative path was hardcoded then.
Forwarded: no
Author: Martin Quinson <mquinson(a)debian.org>
Last-Update: 2013-01-26
Index: frogatto/src/font.cpp
===================================================================
--- frogatto.orig/src/font.cpp 2013-01-12 20:49:22.049472442 +0100
+++ frogatto/src/font.cpp 2013-01-26 22:44:45.390874240 +0100
@@ -20,7 +20,7 @@
#endif
namespace {
-const char* FontFile = "UbuntuMono-R.ttf";
+const char* FontFile = "/usr/share/fonts/gnu-free/FreeMono.ttf";
std::map<int, TTF_Font*> font_table;
Index: frogatto/src/vector_text.cpp
===================================================================
--- frogatto.orig/src/vector_text.cpp 2013-01-12 20:49:22.125473580 +0100
+++ frogatto/src/vector_text.cpp 2013-01-26 22:45:35.918522864 +0100
@@ -13,7 +13,7 @@
: text_(i18n::tr(node["text"].as_string())),
visible_(node["visible"].as_bool(true)),
size_(node["size"].as_int(12)),
- font_(node["font"].as_string_default("UbuntuMono-R"))
+ font_(node["font"].as_string_default("FreeMono"))
{
std::vector<int> r = node["rect"].as_list_int();
draw_area_ = rect(r[0], r[1], r[2], r[3]);
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 8 Apr 2013 10:25:26 -0000 1.7
+++ .cvsignore 2 Oct 2013 15:09:21 -0000 1.8
@@ -1 +1 @@
-1.3.1.tar.gz
+frogatto-1.3.3-a7ef3bf.tar.gz
Index: frogatto.spec
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/frogatto.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- frogatto.spec 26 Aug 2013 19:50:30 -0000 1.13
+++ frogatto.spec 2 Oct 2013 15:09:21 -0000 1.14
@@ -1,21 +1,24 @@
+%global commit a7ef3bfa0c32df4852bf057fab969c1a080edf4d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
Name: frogatto
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.3
+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/
-Source0: https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz
+Source0: https://github.com/frogatto/frogatto/archive/%{commit}/%{name}-%{version}...
Source1: %{name}.sh
Source2: %{name}.desktop
-Source3: %{name}.xpm
-Source4: %{name}.pod
+Source3: %{name}.pod
# Patch Makefile not to link lSDLmain
Patch0: %{name}-1.2-Makefile.patch
-# boost no longer has separate non mt and -mt variants of its libs
+# Boost no longer has separate non mt and -mt variants of its libs
Patch1: %{name}-1.3-no-boost-mt.patch
+# Use FreeFont instead of the Ubuntu Font Family
+Patch2: %{name}-1.3-fonts.patch
BuildRequires: SDL-devel >= 1.2.7
BuildRequires: SDL_image-devel
@@ -27,6 +30,8 @@
BuildRequires: ccache
BuildRequires: boost-devel
BuildRequires: perl-podlators
+BuildRequires: gnu-free-mono-fonts
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -42,9 +47,10 @@
%prep
-%setup -q
+%setup -qn %{name}-%{commit}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# Fix locale file path
sed -i 's!"./locale/"!"%{_datadir}/locale/"!' src/i18n.cpp
@@ -67,8 +73,8 @@
cp -pr data images music *.cfg \
%{buildroot}%{_datadir}/%{name}
pushd modules/%{name}
-cp -pr data images music sounds *.cfg \
- %{buildroot}%{_datadir}/%{name}/modules/%{name}
+ cp -pr data images music sounds *.cfg \
+ %{buildroot}%{_datadir}/%{name}/modules/%{name}
# Install translations
cp -pr locale %{buildroot}%{_datadir}
popd
@@ -79,9 +85,15 @@
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
-# Install icon
-install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 -p %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Extract Mac OS X icons
+icns2png -x modules/%{name}/images/os/mac/icon.icns
+
+# Install icons
+for i in 16 32 128 256; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 icon_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
# Install man page
install -d %{buildroot}%{_mandir}/man6
@@ -89,7 +101,7 @@
-center="RPM Fusion contributed man pages" \
-release="%{name} %{version}" \
-date="July 13th, 2010" \
- %{SOURCE4} > %{buildroot}%{_mandir}/man6/%{name}.6
+ %{SOURCE3} > %{buildroot}%{_mandir}/man6/%{name}.6
%find_lang %{name}
@@ -114,12 +126,18 @@
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_libexecdir}/%{name}
-%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_mandir}/man6/%{name}.6*
%changelog
+* Wed Sep 25 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.3.3-1
+- Updated to upstream v1.3.3 as of Aug 21, 2013
+- Fixed crash when attempting to enter in editor mode (#2966)
+- Used Mac OS X icons
+- Removed Group tag
+
* Mon Aug 26 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.3.1-3
- Rebuild for new boost
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/frogatto/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 8 Apr 2013 10:25:26 -0000 1.7
+++ sources 2 Oct 2013 15:09:21 -0000 1.8
@@ -1 +1 @@
-f3206fbe1395ea2878092fbd4ed2c591 1.3.1.tar.gz
+d5b56bb9a6fa6bf6506e68a928fcc858 frogatto-1.3.3-a7ef3bf.tar.gz
--- frogatto.xpm DELETED ---
10 years, 7 months
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec,1.99,1.100
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26609
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix build
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- xorg-x11-drv-nvidia.spec 2 Oct 2013 10:04:42 -0000 1.99
+++ xorg-x11-drv-nvidia.spec 2 Oct 2013 12:11:02 -0000 1.100
@@ -407,15 +407,16 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{_nvidia_libdir}/libcuda.so
%{_includedir}/nvidia/
%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-encode.so
%endif
+%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
+%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
@@ -424,6 +425,8 @@
%changelog
* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-1
- Update to 319.60
+- Avoid to exclude libcuda.so in devel
+- Add libnvidia-ifr.so
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-7
- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
10 years, 7 months
rpms/nvidia-kmod/F-18 nvidia-kmod.spec,1.165,1.166
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2552
Modified Files:
nvidia-kmod.spec
Log Message:
Bump
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- nvidia-kmod.spec 2 Oct 2013 10:09:17 -0000 1.165
+++ nvidia-kmod.spec 2 Oct 2013 10:09:54 -0000 1.166
@@ -9,7 +9,7 @@
Epoch: 1
Version: 319.60
# Taken over by kmodtool
-Release: 0%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-1
+- Update to 319.60
+
* Tue Oct 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2.6
- Rebuilt for kernel
10 years, 7 months
rpms/nvidia-kmod/F-18 .cvsignore, 1.52, 1.53 nvidia-kmod.spec, 1.164, 1.165 sources, 1.56, 1.57 3.10_kernel.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv842/F-18
Modified Files:
.cvsignore nvidia-kmod.spec sources
Removed Files:
3.10_kernel.patch
Log Message:
Update to 319.60
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 24 Jul 2013 10:34:49 -0000 1.52
+++ .cvsignore 2 Oct 2013 10:09:16 -0000 1.53
@@ -1 +1 @@
-nvidia-kmod-data-319.32.tar.xz
+nvidia-kmod-data-319.60.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- nvidia-kmod.spec 1 Oct 2013 14:40:51 -0000 1.164
+++ nvidia-kmod.spec 2 Oct 2013 10:09:17 -0000 1.165
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 319.32
+Version: 319.60
# Taken over by kmodtool
-Release: 2%{?dist}.6
+Release: 0%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,6 @@
Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: 3.10_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +47,7 @@
for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
-%patch0 -p1
+echo "Nothing to patch"
popd
done
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 24 Jul 2013 10:34:49 -0000 1.56
+++ sources 2 Oct 2013 10:09:17 -0000 1.57
@@ -1 +1 @@
-823f54bebd8c9c6184935ae9c8b18cf3 nvidia-kmod-data-319.32.tar.xz
+213479b23769fca63806f648ddb1ee1c nvidia-kmod-data-319.60.tar.xz
--- 3.10_kernel.patch DELETED ---
10 years, 7 months
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec, 1.98, 1.99 .cvsignore, 1.52, 1.53 sources, 1.56, 1.57
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30384
Modified Files:
xorg-x11-drv-nvidia.spec .cvsignore sources
Log Message:
Update to 319.60
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- xorg-x11-drv-nvidia.spec 2 Oct 2013 09:25:00 -0000 1.98
+++ xorg-x11-drv-nvidia.spec 2 Oct 2013 10:04:42 -0000 1.99
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.60
-Release: 0%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -22,10 +22,12 @@
Source6: blacklist-nouveau.conf
BuildRequires: desktop-file-utils
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
Buildrequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
+%endif
ExclusiveArch: i686 x86_64 armv7hl
@@ -110,11 +112,16 @@
%prep
%setup -q -c -T
+#Only extract the needed arch
+%ifarch %{ix86}
sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+%endif
+%ifarch x86_64
sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+%endif
+%ifarch armv7hl
sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
-tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-
+%endif
ln -s nvidiapkg-%{_target_cpu} nvidiapkg
%build
@@ -226,16 +233,24 @@
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \
$RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service
#Change the daemon running owner
sed -i -e "s/__USER__/root/" $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service
+%endif
#Create the default nvidia config directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
+%pre
+if [ "$1" -eq "1" ]; then
+ if [ -x %{_bindir}/nvidia-uninstall ]; then
+ %{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || :
+ fi
+fi
%post
if [ "$1" -eq "1" ]; then
@@ -259,7 +274,9 @@
&>/dev/null
done
fi
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%endif
fi || :
%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
@@ -311,20 +328,24 @@
done
fi
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
/bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || :
/bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || :
+%endif
#Backup and disable previously used xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] && \
mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
fi ||:
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart nvidia-persistenced.service >/dev/null 2>&1 || :
fi
+%endif
%postun libs -p /sbin/ldconfig
@@ -344,7 +365,9 @@
%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
+%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
%{_unitdir}/nvidia-persistenced.service
+%endif
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
@@ -399,6 +422,9 @@
%changelog
+* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-1
+- Update to 319.60
+
* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-7
- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 24 Jul 2013 10:32:22 -0000 1.52
+++ .cvsignore 2 Oct 2013 10:04:42 -0000 1.53
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-NVIDIA-Linux-x86-319.32.run
-NVIDIA-Linux-x86_64-319.32.run
+NVIDIA-Linux-armv7l-gnueabihf-319.60.run
+NVIDIA-Linux-x86-319.60.run
+NVIDIA-Linux-x86_64-319.60.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources 24 Jul 2013 10:32:22 -0000 1.56
+++ sources 2 Oct 2013 10:04:42 -0000 1.57
@@ -1,3 +1,3 @@
-1cbf302ed5b5a9988e1c575f8f01336a NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-978339ff37c3207f3a39d3952721dcdb NVIDIA-Linux-x86-319.32.run
-608767a3e1bee8a030f31cdc9251182e NVIDIA-Linux-x86_64-319.32.run
+28b4f8fdddf70b25d8c5f1e73fcd71e7 NVIDIA-Linux-armv7l-gnueabihf-319.60.run
+893958183acc35feb0740747c7da306b NVIDIA-Linux-x86-319.60.run
+e31404d2e5aa0fa90b5b138ed9c666a3 NVIDIA-Linux-x86_64-319.60.run
10 years, 7 months