rpms/nvidia-settings/devel nvidia-settings.spec,1.36,1.37
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5363/devel
Modified Files:
nvidia-settings.spec
Log Message:
Untouch the files
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nvidia-settings.spec 21 Jul 2013 14:02:47 -0000 1.36
+++ nvidia-settings.spec 21 Jul 2013 15:21:39 -0000 1.37
@@ -98,13 +98,13 @@
#Move the binary elsewhere
mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \
$RPM_BUILD_ROOT%{_bindir}/nvidia-settings-%{nserie}
-touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+#touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/nvidia-settings*
#Move the manpage elsewhere
mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz \
$RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
-touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
+#touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings*
10 years, 9 months
rpms/nvidia-settings/F-17 nvidia-settings.spec,1.28,1.29
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5363/F-17
Modified Files:
nvidia-settings.spec
Log Message:
Untouch the files
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-17/nvidia-settings.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nvidia-settings.spec 21 Jul 2013 14:02:48 -0000 1.28
+++ nvidia-settings.spec 21 Jul 2013 15:21:39 -0000 1.29
@@ -98,13 +98,13 @@
#Move the binary elsewhere
mv $RPM_BUILD_ROOT%{_bindir}/nvidia-settings \
$RPM_BUILD_ROOT%{_bindir}/nvidia-settings-%{nserie}
-touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+#touch $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/nvidia-settings*
#Move the manpage elsewhere
mv $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz \
$RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings-%{nserie}.1.gz
-touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
+#touch $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings.1.gz
chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/nvidia-settings*
10 years, 9 months
rpms/caja-dropbox/devel .cvsignore,1.2,1.3 sources,1.2,1.3
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5330
Modified Files:
.cvsignore sources
Log Message:
add dropbox script binary as source
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jul 2013 21:34:10 -0000 1.2
+++ .cvsignore 21 Jul 2013 15:21:28 -0000 1.3
@@ -1 +1,2 @@
nautilus-dropbox-1.6.0.tar.bz2
+dropbox
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 Jul 2013 21:34:11 -0000 1.2
+++ sources 21 Jul 2013 15:21:28 -0000 1.3
@@ -1 +1,2 @@
ab4ca49eb24498d14edad2c29aac530b nautilus-dropbox-1.6.0.tar.bz2
+0cad574402d96f452472c8fd48391203 dropbox
10 years, 9 months
rpms/xorg-x11-drv-nvidia-96xx/F-17 nvidia-settings.desktop,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4870
Added Files:
nvidia-settings.desktop
Log Message:
Add back the destop fil
Index: nvidia-settings.desktop
===================================================================
RCS file: nvidia-settings.desktop
diff -N nvidia-settings.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-settings.desktop 21 Jul 2013 15:15:16 -0000 1.5
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=NVIDIA X Server Settings
+Comment=Configure NVIDIA X Server Settings
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
+
+# Translations provided by Sun Microsystems
+Name[de]=NVIDIA X-Server-Einstellungen
+Name[es]=Valores de configuración del servidor NVIDIA X
+Name[fr]=Paramètres du serveur X NVIDIA
+Name[it]=NVIDIA X Server Settings
+Name[ja]=NVIDIA X サーバー設定
+Name[ko]=NVIDIA X 서버 설정
+Name[pt_BR]=Configurações do NVIDIA X Server
+Name[zh_CN]=NVIDIA X 服务器设置
+Name[zh_HK]=NVIDIA X 伺服器設定
+Name[zh_TW]=NVIDIA X 伺服器設定
+Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
+Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
+Comment[fr]=Configurer les paramètres du serveur X NVIDIA
+Comment[it]=Configura NVIDIA X Server Settings
+Comment[ja]=NVIDIA X サーバー設定を構成します
+Comment[ko]=NVIDIA X 서버 설정 구성
+Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
+Comment[zh_CN]=配置 NVIDIA X 服务器设置
+Comment[zh_HK]=配置 NVIDIA X 伺服器設定
+Comment[zh_TW]=配置 NVIDIA X 伺服器設定
10 years, 9 months
rpms/xorg-x11-drv-nvidia-96xx/F-17 xorg-x11-drv-nvidia-96xx.spec, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4758
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
- Avoid Obsoletes until rhbz#985944
- Restore destop file
- Fix typo with libGLcore filter
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-17/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-nvidia-96xx.spec 15 Sep 2012 11:50:03 -0000 1.25
+++ xorg-x11-drv-nvidia-96xx.spec 21 Jul 2013 15:14:43 -0000 1.26
@@ -5,7 +5,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.23
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,6 +17,7 @@
Source3: nvidia-96xx-xorg.conf
Source6: blacklist-nouveau.conf
Source11: nvidia-96xx-README.Fedora
+Source99: nvidia-settings.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -26,14 +27,15 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: nvidia-settings
+#Requires: nvidia-xconfig
+#Requires: nvidia-settings
Requires: nvidia-96xx-kmod >= %{version}
Requires(post): nvidia-96xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
+BuildRequires: desktop-file-utils
Requires: which
#Requires: livna-config-display
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
@@ -65,12 +67,12 @@
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
-%filter_from_provides /^libGLCore\.so/d;
+%filter_from_provides /^libGLcore\.so/d;
%filter_from_provides /^libGL\.so/d;
%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_provides /^libglx\.so/d;
%filter_from_requires /^libnvidia/d;
-%filter_from_requires /^libGLCore\.so/d;
+%filter_from_requires /^libGLcore\.so/d;
%filter_from_requires /^libGL\.so/d;
%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
%filter_from_requires /^libglx\.so/d;
@@ -231,6 +233,13 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+#Restore desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --mode 644 \
+ %{SOURCE99}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -288,9 +297,10 @@
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-96xx-xorg.conf
#{_initrddir}/nvidia-96xx
-%exclude %{_bindir}/nvidia-settings
-%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-settings
+%{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
+%{_datadir}/applications/*.desktop
#{_sbindir}/nvidia-96xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
@@ -298,8 +308,8 @@
%{_libdir}/xorg/modules/extensions/nvidia/*.so*
#/no_multilib
%{_datadir}/pixmaps/*.png
-%exclude %{_mandir}/man1/nvidia-settings.*
-%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-settings.*
+%{_mandir}/man1/nvidia-xconfig.*
%files libs
%defattr(-,root,root,-)
@@ -319,6 +329,11 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-2
+- Avoid Obsoletes until rhbz#985944
+- Restore destop file
+- Fix typo with libGLcore filter
+
* Sat Sep 15 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 96.43.23-1
- Update to 96.43.23
- Rebase with main serie packaging improvements
10 years, 9 months
rpms/caja-dropbox/devel dropbox,1.1,NONE
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4392
Removed Files:
dropbox
Log Message:
remove dropbox script
--- dropbox DELETED ---
10 years, 9 months
rpms/xorg-x11-drv-nvidia-304xx/F-18 xorg-x11-drv-nvidia-304xx.spec, 1.12, 1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3351/F-18
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Fix
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-nvidia-304xx.spec 18 Jul 2013 07:50:48 -0000 1.12
+++ xorg-x11-drv-nvidia-304xx.spec 21 Jul 2013 14:57:23 -0000 1.13
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -28,11 +28,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: which
@@ -388,6 +388,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-12
+- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-11
- Fix typo with libGLcore filter
- Avoid a Virtual Provides for legacy series
10 years, 9 months
rpms/xorg-x11-drv-nvidia-304xx/F-19 xorg-x11-drv-nvidia-304xx.spec, 1.9, 1.10
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3351/F-19
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Fix
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-nvidia-304xx.spec 15 Jul 2013 08:47:13 -0000 1.9
+++ xorg-x11-drv-nvidia-304xx.spec 21 Jul 2013 14:57:23 -0000 1.10
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -28,11 +28,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: which
@@ -388,6 +388,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-12
+- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-11
- Fix typo with libGLcore filter
- Avoid a Virtual Provides for legacy series
10 years, 9 months
rpms/xorg-x11-drv-nvidia-304xx/F-17 xorg-x11-drv-nvidia-304xx.spec, 1.7, 1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3351/F-17
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Fix
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-nvidia-304xx.spec 18 Jul 2013 07:50:48 -0000 1.7
+++ xorg-x11-drv-nvidia-304xx.spec 21 Jul 2013 14:57:23 -0000 1.8
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -28,11 +28,11 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Obsoletes: nvidia-xconfig < 1.0-30
+#Obsoletes: nvidia-xconfig < 1.0-30
#Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
+#Obsoletes: nvidia-settings < 1.0-34
#Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
+#Obsoletes: nvidia-settings-desktop < 1.0-34
#Provides: nvidia-settings-desktop = %{version}-%{release}
Requires: which
@@ -388,6 +388,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-12
+- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-11
- Fix typo with libGLcore filter
- Avoid a Virtual Provides for legacy series
10 years, 9 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.109,1.110
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3193
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix
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.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- xorg-x11-drv-nvidia.spec 19 Jul 2013 15:37:40 -0000 1.109
+++ xorg-x11-drv-nvidia.spec 21 Jul 2013 14:56:02 -0000 1.110
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.32
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -29,12 +29,12 @@
ExclusiveArch: i686 x86_64 armv7hl
-Obsoletes: nvidia-xconfig < 1.0-30
-Provides: nvidia-xconfig = %{version}-%{release}
-Obsoletes: nvidia-settings < 1.0-34
-Provides: nvidia-settings = %{version}-%{release}
-Obsoletes: nvidia-settings-desktop < 1.0-34
-Provides: nvidia-settings-desktop = %{version}-%{release}
+#Obsoletes: nvidia-xconfig < 1.0-30
+#Provides: nvidia-xconfig = %{version}-%{release}
+#Obsoletes: nvidia-settings < 1.0-34
+#Provides: nvidia-settings = %{version}-%{release}
+#Obsoletes: nvidia-settings-desktop < 1.0-34
+#Provides: nvidia-settings-desktop = %{version}-%{release}
Provides: nvidia-modprobe = %{version}-%{release}
Provides: nvidia-persistenced = %{version}-%{release}
@@ -399,6 +399,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-7
+- Disable Obsoletes/Provides of nvidia tools until rhbz#985944
+
* Mon Jul 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-6
- Fix typo with libGLcore filter
10 years, 9 months