rpms/gecko-mediaplayer/F-12 .cvsignore, 1.14, 1.15 gecko-mediaplayer.spec, 1.22, 1.23 sources, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2196
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 25 Feb 2010 21:40:13 -0000 1.14
+++ .cvsignore 6 Nov 2010 01:22:39 -0000 1.15
@@ -1 +1 @@
-gecko-mediaplayer-0.9.9.2.tar.gz
+gecko-mediaplayer-1.0.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-12/gecko-mediaplayer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gecko-mediaplayer.spec 25 Feb 2010 21:40:13 -0000 1.22
+++ gecko-mediaplayer.spec 6 Nov 2010 01:22:39 -0000 1.23
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.9.9.2
+Version: 1.0.0
Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -90,6 +90,9 @@
%changelog
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 25 Feb 2010 21:40:13 -0000 1.14
+++ sources 6 Nov 2010 01:22:39 -0000 1.15
@@ -1 +1 @@
-deb41a4bcbde2b78d548dc37b684cfbb gecko-mediaplayer-0.9.9.2.tar.gz
+80ccb671aea90153be9f9e6dc41b7eae gecko-mediaplayer-1.0.0.tar.gz
14 years
rpms/gecko-mediaplayer/F-13 .cvsignore, 1.14, 1.15 gecko-mediaplayer.spec, 1.24, 1.25 sources, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1800
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-13/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 25 Feb 2010 21:39:40 -0000 1.14
+++ .cvsignore 6 Nov 2010 01:18:57 -0000 1.15
@@ -1 +1 @@
-gecko-mediaplayer-0.9.9.2.tar.gz
+gecko-mediaplayer-1.0.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-13/gecko-mediaplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gecko-mediaplayer.spec 18 May 2010 15:28:37 -0000 1.24
+++ gecko-mediaplayer.spec 6 Nov 2010 01:18:57 -0000 1.25
@@ -1,6 +1,6 @@
Name: gecko-mediaplayer
-Version: 0.9.9.2
-Release: 2%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
@@ -90,8 +90,8 @@
%changelog
-* Tue May 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.9.2-2
-- rebuilt
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-13/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 25 Feb 2010 21:39:40 -0000 1.14
+++ sources 6 Nov 2010 01:18:57 -0000 1.15
@@ -1 +1 @@
-deb41a4bcbde2b78d548dc37b684cfbb gecko-mediaplayer-0.9.9.2.tar.gz
+80ccb671aea90153be9f9e6dc41b7eae gecko-mediaplayer-1.0.0.tar.gz
14 years
rpms/gecko-mediaplayer/F-14 .cvsignore, 1.14, 1.15 gecko-mediaplayer.spec, 1.22, 1.23 sources, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1698
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-14/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 25 Feb 2010 21:39:40 -0000 1.14
+++ .cvsignore 6 Nov 2010 01:18:49 -0000 1.15
@@ -1 +1 @@
-gecko-mediaplayer-0.9.9.2.tar.gz
+gecko-mediaplayer-1.0.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-14/gecko-mediaplayer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gecko-mediaplayer.spec 25 Feb 2010 21:39:40 -0000 1.22
+++ gecko-mediaplayer.spec 6 Nov 2010 01:18:49 -0000 1.23
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.9.9.2
+Version: 1.0.0
Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -90,6 +90,9 @@
%changelog
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-14/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 25 Feb 2010 21:39:40 -0000 1.14
+++ sources 6 Nov 2010 01:18:49 -0000 1.15
@@ -1 +1 @@
-deb41a4bcbde2b78d548dc37b684cfbb gecko-mediaplayer-0.9.9.2.tar.gz
+80ccb671aea90153be9f9e6dc41b7eae gecko-mediaplayer-1.0.0.tar.gz
14 years
rpms/gecko-mediaplayer/devel .cvsignore, 1.14, 1.15 gecko-mediaplayer.spec, 1.22, 1.23 sources, 1.14, 1.15
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1589
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 25 Feb 2010 21:39:40 -0000 1.14
+++ .cvsignore 6 Nov 2010 01:18:40 -0000 1.15
@@ -1 +1 @@
-gecko-mediaplayer-0.9.9.2.tar.gz
+gecko-mediaplayer-1.0.0.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gecko-mediaplayer.spec 25 Feb 2010 21:39:40 -0000 1.22
+++ gecko-mediaplayer.spec 6 Nov 2010 01:18:40 -0000 1.23
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 0.9.9.2
+Version: 1.0.0
Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -90,6 +90,9 @@
%changelog
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 25 Feb 2010 21:39:40 -0000 1.14
+++ sources 6 Nov 2010 01:18:41 -0000 1.15
@@ -1 +1 @@
-deb41a4bcbde2b78d548dc37b684cfbb gecko-mediaplayer-0.9.9.2.tar.gz
+80ccb671aea90153be9f9e6dc41b7eae gecko-mediaplayer-1.0.0.tar.gz
14 years
rpms/gnome-mplayer/F-13 .cvsignore, 1.15, 1.16 gnome-mplayer.spec, 1.30, 1.31 sources, 1.15, 1.16 gnome-mplayer-0.9.9.2-dso.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1402
Modified Files:
.cvsignore gnome-mplayer.spec sources
Removed Files:
gnome-mplayer-0.9.9.2-dso.patch
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Dropped upstreamed patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-13/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Feb 2010 21:42:15 -0000 1.15
+++ .cvsignore 6 Nov 2010 01:16:36 -0000 1.16
@@ -1 +1 @@
-gnome-mplayer-0.9.9.2.tar.gz
+gnome-mplayer-1.0.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-13/gnome-mplayer.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gnome-mplayer.spec 18 May 2010 09:58:13 -0000 1.30
+++ gnome-mplayer.spec 6 Nov 2010 01:16:36 -0000 1.31
@@ -1,13 +1,12 @@
Name: gnome-mplayer
-Version: 0.9.9.2
-Release: 2%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
Group: Applications/Multimedia
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: gnome-mplayer-0.9.9.2-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -93,7 +92,6 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
-%patch0 -p1 -b .dso
%build
@@ -209,8 +207,9 @@
%changelog
-* Tue May 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9.9.2-2
-- rebuilt
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+- Dropped upstreamed patch
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 25 Feb 2010 21:42:15 -0000 1.15
+++ sources 6 Nov 2010 01:16:36 -0000 1.16
@@ -1 +1 @@
-79810913d245755b60c27d37e1d1f178 gnome-mplayer-0.9.9.2.tar.gz
+2c8c7e679fa02e524face3fdb504b39d gnome-mplayer-1.0.0.tar.gz
--- gnome-mplayer-0.9.9.2-dso.patch DELETED ---
14 years
rpms/gnome-mplayer/F-14 .cvsignore, 1.15, 1.16 gnome-mplayer.spec, 1.29, 1.30 sources, 1.15, 1.16 gnome-mplayer-0.9.9.2-dso.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1288
Modified Files:
.cvsignore gnome-mplayer.spec sources
Removed Files:
gnome-mplayer-0.9.9.2-dso.patch
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Dropped upstreamed patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Feb 2010 21:42:15 -0000 1.15
+++ .cvsignore 6 Nov 2010 01:16:28 -0000 1.16
@@ -1 +1 @@
-gnome-mplayer-0.9.9.2.tar.gz
+gnome-mplayer-1.0.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/gnome-mplayer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-mplayer.spec 26 Feb 2010 17:39:15 -0000 1.29
+++ gnome-mplayer.spec 6 Nov 2010 01:16:29 -0000 1.30
@@ -1,5 +1,5 @@
Name: gnome-mplayer
-Version: 0.9.9.2
+Version: 1.0.0
Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
@@ -7,7 +7,6 @@
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: gnome-mplayer-0.9.9.2-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -93,7 +92,6 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
-%patch0 -p1 -b .dso
%build
@@ -209,6 +207,10 @@
%changelog
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+- Dropped upstreamed patch
+
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
- Added bits necessary for https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-14/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 25 Feb 2010 21:42:15 -0000 1.15
+++ sources 6 Nov 2010 01:16:29 -0000 1.16
@@ -1 +1 @@
-79810913d245755b60c27d37e1d1f178 gnome-mplayer-0.9.9.2.tar.gz
+2c8c7e679fa02e524face3fdb504b39d gnome-mplayer-1.0.0.tar.gz
--- gnome-mplayer-0.9.9.2-dso.patch DELETED ---
14 years
rpms/gnome-mplayer/devel .cvsignore, 1.15, 1.16 gnome-mplayer.spec, 1.29, 1.30 sources, 1.15, 1.16 gnome-mplayer-0.9.9.2-dso.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1182
Modified Files:
.cvsignore gnome-mplayer.spec sources
Removed Files:
gnome-mplayer-0.9.9.2-dso.patch
Log Message:
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Dropped upstreamed patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Feb 2010 21:42:15 -0000 1.15
+++ .cvsignore 6 Nov 2010 01:16:20 -0000 1.16
@@ -1 +1 @@
-gnome-mplayer-0.9.9.2.tar.gz
+gnome-mplayer-1.0.0.tar.gz
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/gnome-mplayer.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-mplayer.spec 26 Feb 2010 17:39:15 -0000 1.29
+++ gnome-mplayer.spec 6 Nov 2010 01:16:20 -0000 1.30
@@ -1,5 +1,5 @@
Name: gnome-mplayer
-Version: 0.9.9.2
+Version: 1.0.0
Release: 1%{?dist}
Summary: An MPlayer GUI, a full-featured binary
@@ -7,7 +7,6 @@
License: GPLv2+
URL: http://kdekorte.googlepages.com/gnomemplayer
Source0: http://gnome-mplayer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0: gnome-mplayer-0.9.9.2-dso.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -93,7 +92,6 @@
mv %{name}-%{version} generic
tar -xzf %{SOURCE0}
mv %{name}-%{version} minimal
-%patch0 -p1 -b .dso
%build
@@ -209,6 +207,10 @@
%changelog
+* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
+- Updated to 1.0.0
+- Dropped upstreamed patch
+
* Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1
- Updated to 0.9.9.2
- Added bits necessary for https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 25 Feb 2010 21:42:15 -0000 1.15
+++ sources 6 Nov 2010 01:16:20 -0000 1.16
@@ -1 +1 @@
-79810913d245755b60c27d37e1d1f178 gnome-mplayer-0.9.9.2.tar.gz
+2c8c7e679fa02e524face3fdb504b39d gnome-mplayer-1.0.0.tar.gz
--- gnome-mplayer-0.9.9.2-dso.patch DELETED ---
14 years
rpms/avidemux/F-14 avidemux.spec,1.36,1.37
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32294
Modified Files:
avidemux.spec
Log Message:
* Fri Nov 5 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-6
- Remove dir /usr/share/avidemux as nothing installs there anymore
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- avidemux.spec 26 Oct 2010 19:01:42 -0000 1.36
+++ avidemux.spec 5 Nov 2010 16:35:59 -0000 1.37
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -239,7 +239,6 @@
%files libs -f %{name}.lang
%doc AUTHORS COPYING README TODO
-%dir %{_datadir}/%{name}
%{_datadir}/ADM_scripts/
%{_datadir}/pixmaps/avidemux.png
%{_libdir}/libADM*
@@ -268,6 +267,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Fri Nov 5 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-6
+- Remove dir /usr/share/avidemux as nothing installs there anymore
+
* Tue Oct 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-5
- Add x264 field asm patch to fix F-14 build (#1447)
- Fix main package's dependency on the GUI subpackage (Bernie Innocentie)
14 years
rpms/xorg-x11-drv-nvidia-173xx/devel 00-nvidia.conf, NONE, 1.1 nvidia-173xx-xorg.conf, NONE, 1.1 xorg-x11-drv-nvidia-173xx.spec, 1.18, 1.19
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7272/devel
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
00-nvidia.conf nvidia-173xx-xorg.conf
Log Message:
Rsync with 173xx
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE nvidia-173xx-xorg.conf ---
# RPM Fusion - nvidia-173xx-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
Option "AddARGBGLXVisuals" "true"
EndSection
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-nvidia-173xx.spec 7 Oct 2010 22:00:14 -0000 1.18
+++ xorg-x11-drv-nvidia-173xx.spec 5 Nov 2010 10:09:16 -0000 1.19
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.28
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,9 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source5: nvidia-173xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-173xx-xorg.conf
+#Source5: nvidia-173xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-173xx-config-display
Source11: nvidia-173xx-README.Fedora
@@ -45,14 +47,18 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display >= 0.0.22
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+#Requires: livna-config-display >= 0.0.22
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
-Requires(post): livna-config-display >= 0.0.22
-Requires(preun): livna-config-display >= 0.0.22
-Requires(post): chkconfig
+#Requires(post): livna-config-display >= 0.0.22
+#Requires(preun): livna-config-display >= 0.0.22
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-173xx-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-newest
@@ -80,7 +86,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -201,10 +211,10 @@
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
@@ -228,6 +238,13 @@
%endif
%endif
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
%clean
@@ -237,10 +254,10 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-173xx-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-173xx-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia-173xx ||:
- /etc/init.d/nvidia-173xx start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia-173xx ||:
+ #/etc/init.d/nvidia-173xx start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
@@ -255,12 +272,27 @@
%post libs -p /sbin/ldconfig
+%posttrans
+ [ -f %{_sysconfdir}/X11/xorg.conf ] || \
+ cp -p %{_sysconfdir}/X11/nvidia-173xx-xorg.conf %{_sysconfdir}/X11/xorg.conf ||
+
%preun
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-173xx-config-display && %{_sbindir}/nvidia-173xx-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia-173xx stop &> /dev/null ||:
- /sbin/chkconfig --del nvidia-173xx ||:
+ #%_initrddir}/nvidia-173xx stop &> /dev/null ||:
+ #/sbin/chkconfig --del nvidia-173xx ||:
+ #Clear grub option to disable nouveau for all kernels
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby --update-kernel=${kernel} \
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
+ done
+ fi
+ #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 ||:
%postun libs -p /sbin/ldconfig
@@ -268,13 +300,15 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia-173xx
+%config(noreplace) %{_sysconfdir}/X11/nvidia-173xx-xorg.conf
+#{_initrddir}/nvidia-173xx
%exclude %{_bindir}/nvidia-settings
%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
-%{_sbindir}/nvidia-173xx-config-display
+#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -304,6 +338,13 @@
%changelog
+* Fri Nov 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.28-2
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
+
* Thu Oct 07 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.28-1
- Update to 173.14.28
14 years
rpms/xorg-x11-drv-nvidia-173xx/F-14 00-nvidia.conf, NONE, 1.1 nvidia-173xx-xorg.conf, NONE, 1.1 xorg-x11-drv-nvidia-173xx.spec, 1.18, 1.19
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7272/F-14
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Added Files:
00-nvidia.conf nvidia-173xx-xorg.conf
Log Message:
Rsync with 173xx
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE nvidia-173xx-xorg.conf ---
# RPM Fusion - nvidia-173xx-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
Option "AddARGBGLXVisuals" "true"
EndSection
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-14/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-nvidia-173xx.spec 7 Oct 2010 22:00:14 -0000 1.18
+++ xorg-x11-drv-nvidia-173xx.spec 5 Nov 2010 10:09:17 -0000 1.19
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.28
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,7 +16,9 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source5: nvidia-173xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-173xx-xorg.conf
+#Source5: nvidia-173xx-init
Source6: blacklist-nouveau.conf
Source10: nvidia-173xx-config-display
Source11: nvidia-173xx-README.Fedora
@@ -45,14 +47,18 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display >= 0.0.22
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+#Requires: livna-config-display >= 0.0.22
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
-Requires(post): livna-config-display >= 0.0.22
-Requires(preun): livna-config-display >= 0.0.22
-Requires(post): chkconfig
+#Requires(post): livna-config-display >= 0.0.22
+#Requires(preun): livna-config-display >= 0.0.22
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-173xx-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-newest
@@ -80,7 +86,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -201,10 +211,10 @@
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-173xx-config-display
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-173xx
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
@@ -228,6 +238,13 @@
%endif
%endif
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
%clean
@@ -237,10 +254,10 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-173xx-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-173xx-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia-173xx ||:
- /etc/init.d/nvidia-173xx start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia-173xx ||:
+ #/etc/init.d/nvidia-173xx start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
@@ -255,12 +272,27 @@
%post libs -p /sbin/ldconfig
+%posttrans
+ [ -f %{_sysconfdir}/X11/xorg.conf ] || \
+ cp -p %{_sysconfdir}/X11/nvidia-173xx-xorg.conf %{_sysconfdir}/X11/xorg.conf ||
+
%preun
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-173xx-config-display && %{_sbindir}/nvidia-173xx-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia-173xx stop &> /dev/null ||:
- /sbin/chkconfig --del nvidia-173xx ||:
+ #%_initrddir}/nvidia-173xx stop &> /dev/null ||:
+ #/sbin/chkconfig --del nvidia-173xx ||:
+ #Clear grub option to disable nouveau for all kernels
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby --update-kernel=${kernel} \
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
+ done
+ fi
+ #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 ||:
%postun libs -p /sbin/ldconfig
@@ -268,13 +300,15 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia-173xx
+%config(noreplace) %{_sysconfdir}/X11/nvidia-173xx-xorg.conf
+#{_initrddir}/nvidia-173xx
%exclude %{_bindir}/nvidia-settings
%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
-%{_sbindir}/nvidia-173xx-config-display
+#{_sbindir}/nvidia-173xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -304,6 +338,13 @@
%changelog
+* Fri Nov 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.28-2
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
+
* Thu Oct 07 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.28-1
- Update to 173.14.28
14 years