rpms/k3b-extras-freeworld/F-13 k3b-extras-freeworld.spec, 1.18, 1.19 sources, 1.9, 1.10
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1651
Modified Files:
k3b-extras-freeworld.spec sources
Log Message:
* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
- k3b-2.0.0
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-13/k3b-extras-freeworld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- k3b-extras-freeworld.spec 23 May 2010 20:18:14 -0000 1.18
+++ k3b-extras-freeworld.spec 10 Jul 2010 16:46:26 -0000 1.19
@@ -1,16 +1,14 @@
-%define pre rc3
-
Name: k3b-extras-freeworld
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
-Version: 1.92.0
+Version: 2.0.0
Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
URL: http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar...
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.ta...
# fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)
Patch1: k3b-1.91.0-ffmpeg06.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +92,9 @@
%changelog
+* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
+- k3b-2.0.0
+
* Sun May 23 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.92.0-1
- k3b-1.92.0 (rc3)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/F-13/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 23 May 2010 20:18:14 -0000 1.9
+++ sources 10 Jul 2010 16:46:26 -0000 1.10
@@ -1 +0,0 @@
-65372e9f2826165071b24c9f1d17882b k3b-1.92.0rc3.tar.bz2
13 years, 10 months
rpms/nvidia-xconfig/F-12 .cvsignore, 1.3, 1.4 nvidia-xconfig.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-xconfig/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29365/F-12
Modified Files:
.cvsignore nvidia-xconfig.spec sources
Log Message:
Update to lastest
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Feb 2010 19:34:41 -0000 1.3
+++ .cvsignore 10 Jul 2010 15:44:18 -0000 1.4
@@ -1 +1 @@
-nvidia-xconfig-195.36.08.tar.bz2
+nvidia-xconfig-256.35.tar.bz2
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/nvidia-xconfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-xconfig.spec 28 Feb 2010 19:34:41 -0000 1.2
+++ nvidia-xconfig.spec 10 Jul 2010 15:44:18 -0000 1.3
@@ -1,14 +1,14 @@
-%global iversion 195.36.08
+%global nversion 256.35
Name: nvidia-xconfig
Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
License: GPLv2+
URL: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/
-Source0: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xco...
+Source0: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xco...
Patch0: nvidia-xconfig-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
%endif
BuildRequires: m4
+Provides: %{name}-nversion = %{nversion}
%description
@@ -29,18 +30,28 @@
%prep
-%setup -q -n nvidia-xconfig-%{iversion}
-%patch0 -p1 -b .default
+%setup -q -n nvidia-xconfig-%{nversion}
+
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
%build
-make CFLAGS="$RPM_OPT_FLAGS -IXF86Config-parser" NVDEBUG=1
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+#We usually have it in sbin
+mv $RPM_BUILD_ROOT%{_bindir}/nvidia-xconfig \
+ $RPM_BUILD_ROOT%{_sbindir}
+rmdir $RPM_BUILD_ROOT%{_bindir}
@@ -55,6 +66,10 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-3
+- Update internal version to 256.35
+- Provides %%{name}-nversion
+
* Sun Feb 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-2
- Update internal version to 195.36.08
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Feb 2010 19:34:41 -0000 1.3
+++ sources 10 Jul 2010 15:44:18 -0000 1.4
@@ -1 +1 @@
-fa58dcfd2a7edaee64467d15bc4679a3 nvidia-xconfig-195.36.08.tar.bz2
+8760a56f782872f5e06190c6737f76a3 nvidia-xconfig-256.35.tar.bz2
13 years, 10 months
rpms/nvidia-xconfig/F-13 .cvsignore, 1.3, 1.4 nvidia-xconfig.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-xconfig/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29251/F-13
Modified Files:
.cvsignore nvidia-xconfig.spec sources
Log Message:
Update to lastest
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Feb 2010 19:33:50 -0000 1.3
+++ .cvsignore 10 Jul 2010 15:43:53 -0000 1.4
@@ -1 +1 @@
-nvidia-xconfig-195.36.08.tar.bz2
+nvidia-xconfig-256.35.tar.bz2
13 years, 10 months
rpms/nvidia-xconfig/devel .cvsignore, 1.3, 1.4 nvidia-xconfig.spec, 1.2, 1.3 sources, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-xconfig/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29082/devel
Modified Files:
.cvsignore nvidia-xconfig.spec sources
Log Message:
Update to lastest
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Feb 2010 19:33:50 -0000 1.3
+++ .cvsignore 10 Jul 2010 15:43:27 -0000 1.4
@@ -1 +1 @@
-nvidia-xconfig-195.36.08.tar.bz2
+nvidia-xconfig-256.35.tar.bz2
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/nvidia-xconfig.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nvidia-xconfig.spec 28 Feb 2010 19:33:50 -0000 1.2
+++ nvidia-xconfig.spec 10 Jul 2010 15:43:27 -0000 1.3
@@ -1,14 +1,14 @@
-%global iversion 195.36.08
+%global nversion 256.35
Name: nvidia-xconfig
Version: 1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
License: GPLv2+
URL: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/
-Source0: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xco...
+Source0: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xco...
Patch0: nvidia-xconfig-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,6 +21,7 @@
%endif
BuildRequires: m4
+Provides: %{name}-nversion = %{nversion}
%description
@@ -29,18 +30,28 @@
%prep
-%setup -q -n nvidia-xconfig-%{iversion}
-%patch0 -p1 -b .default
+%setup -q -n nvidia-xconfig-%{nversion}
+
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
%build
-make CFLAGS="$RPM_OPT_FLAGS -IXF86Config-parser" NVDEBUG=1
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
+#We usually have it in sbin
+mv $RPM_BUILD_ROOT%{_bindir}/nvidia-xconfig \
+ $RPM_BUILD_ROOT%{_sbindir}
+rmdir $RPM_BUILD_ROOT%{_bindir}
@@ -55,6 +66,10 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-3
+- Update internal version to 256.35
+- Provides %%{name}-nversion
+
* Sun Feb 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-2
- Update internal version to 195.36.08
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Feb 2010 19:33:50 -0000 1.3
+++ sources 10 Jul 2010 15:43:27 -0000 1.4
@@ -1 +1 @@
-fa58dcfd2a7edaee64467d15bc4679a3 nvidia-xconfig-195.36.08.tar.bz2
+8760a56f782872f5e06190c6737f76a3 nvidia-xconfig-256.35.tar.bz2
13 years, 10 months
rpms/libquicktime/devel libquicktime-1.1.5-gtk.patch, NONE, 1.1 libquicktime.spec, 1.17, 1.18
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27099
Modified Files:
libquicktime.spec
Added Files:
libquicktime-1.1.5-gtk.patch
Log Message:
Add patch from Dan Horák for newer gtk
libquicktime-1.1.5-gtk.patch:
libquicktime_config.c | 4 ++--
lqt_gtk.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE libquicktime-1.1.5-gtk.patch ---
diff -up libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk libquicktime-1.1.5/utils/gtk/libquicktime_config.c
--- libquicktime-1.1.5/utils/gtk/libquicktime_config.c.gtk 2010-07-08 12:21:24.000000000 +0200
+++ libquicktime-1.1.5/utils/gtk/libquicktime_config.c 2010-07-08 12:22:45.000000000 +0200
@@ -112,8 +112,8 @@ static MainWindow * create_main_window()
G_CALLBACK(main_window_button_callback),
(gpointer)ret);
- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS (ret->save_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->save_button), TRUE);
gtk_widget_show(ret->close_button);
gtk_widget_show(ret->save_button);
diff -up libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk libquicktime-1.1.5/utils/gtk/lqt_gtk.c
--- libquicktime-1.1.5/utils/gtk/lqt_gtk.c.gtk 2010-07-08 12:27:26.000000000 +0200
+++ libquicktime-1.1.5/utils/gtk/lqt_gtk.c 2010-07-08 12:27:04.000000000 +0200
@@ -941,9 +941,9 @@ lqtgtk_create_codec_config_window(lqt_co
G_CALLBACK(codec_config_window_button_callback),
(gpointer)ret);
- GTK_WIDGET_SET_FLAGS (ret->apply_button, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
- GTK_WIDGET_SET_FLAGS (ret->restore_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->apply_button), TRUE);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->restore_button), TRUE);
gtk_widget_show(ret->apply_button);
gtk_widget_show(ret->close_button);
@@ -1240,7 +1240,7 @@ lqtgtk_create_codec_info_window(const lq
ret->mainbox = gtk_vbox_new(0, 10);
ret->close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
- GTK_WIDGET_SET_FLAGS (ret->close_button, GTK_CAN_DEFAULT);
+ gtk_widget_set_can_default(GTK_WIDGET(ret->close_button), TRUE);
g_signal_connect(G_OBJECT(ret->close_button), "clicked",
G_CALLBACK(codec_info_window_button_callback),
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libquicktime.spec 1 May 2010 17:28:37 -0000 1.17
+++ libquicktime.spec 10 Jul 2010 15:18:48 -0000 1.18
@@ -1,11 +1,12 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Patch0: libquicktime-1.1.5-gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
@@ -56,6 +57,7 @@
%prep
%setup -q
+%patch0 -p1 -b .gtk
# --------------------------------------------------------------------
@@ -130,6 +132,9 @@
# --------------------------------------------------------------------
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-2
+- Add libquicktime-1.1.5-gtk.patch from Dan Horák.
+
* Sat May 01 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.1.5-1
- Update to 1.1.5
13 years, 10 months
rpms/nvidia-settings/F-12 nvidia-settings-256.35-validate.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nvidia-settings.spec, 1.5, 1.6 sources, 1.4, 1.5 03_do_not_exit_on_no_scanout.patch, 1.1, NONE nvidia-settings-1.0-default.patch, 1.1, NONE nvidia-settings-1.0-lm.patch, 1.1, NONE nvidia-settings.desktop, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25756/F-12
Modified Files:
.cvsignore nvidia-settings.spec sources
Added Files:
nvidia-settings-256.35-validate.patch
Removed Files:
03_do_not_exit_on_no_scanout.patch
nvidia-settings-1.0-default.patch nvidia-settings-1.0-lm.patch
nvidia-settings.desktop
Log Message:
Update to 256.35
nvidia-settings-256.35-validate.patch:
nvidia-settings.desktop | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE nvidia-settings-256.35-validate.patch ---
diff -up nvidia-settings-256.35/doc/nvidia-settings.desktop.validate nvidia-settings-256.35/doc/nvidia-settings.desktop
--- nvidia-settings-256.35/doc/nvidia-settings.desktop.validate 2010-06-17 05:02:48.000000000 +0200
+++ nvidia-settings-256.35/doc/nvidia-settings.desktop 2010-07-10 16:43:47.000000000 +0200
@@ -3,9 +3,9 @@ Type=Application
Encoding=UTF-8
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
-Exec=__UTILS_PATH__/nvidia-settings
-Icon=__PIXMAP_PATH__/nvidia-settings.png
-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
# Translations provided by Sun Microsystems
Name[de]=NVIDIA X-Server-Einstellungen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Apr 2010 21:44:52 -0000 1.4
+++ .cvsignore 10 Jul 2010 15:01:37 -0000 1.5
@@ -1 +1 @@
-nvidia-settings-195.36.24.tar.gz
+nvidia-settings-256.35.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/nvidia-settings.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-settings.spec 28 Apr 2010 21:44:52 -0000 1.5
+++ nvidia-settings.spec 10 Jul 2010 15:01:38 -0000 1.6
@@ -1,23 +1,20 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.24
+%global nversion 256.35
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
-License: MIT
+License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
-Source1: nvidia-settings.desktop
-Patch0: nvidia-settings-1.0-default.patch
-Patch1: nvidia-settings-1.0-lm.patch
-Patch2: 03_do_not_exit_on_no_scanout.patch
+Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
+Patch0: nvidia-settings-256.35-validate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -39,6 +36,8 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
+Provides: %{name}-nversion = %{nversion}
+
%description
@@ -50,30 +49,35 @@
nvidia-settings is compatible with driver up to %{nversion}.
%prep
-%setup -q
-%patch0 -p1 -b .default
-%patch1 -p1 -b .lm
-%patch2 -p1 -b .noscanout
+%setup -q -n nvidia-settings-%{nversion}
+%patch0 -p1 -b .validate
rm -rf src/libXNVCtrl/libXNVCtrl.a
-sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
-sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
-sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
+sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
# no job control
-make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
+pushd src/libXNVCtrl
+ make
+popd
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE1}
+ doc/nvidia-settings.desktop
%clean
@@ -89,6 +93,11 @@
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-5
+- Update internal to 256.35
+- Use upstream desktop file (completed)
+- Provides %%{name}-nversion internal
+
* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Apr 2010 21:44:52 -0000 1.4
+++ sources 10 Jul 2010 15:01:38 -0000 1.5
@@ -1 +1 @@
-43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
+125d6c4e9eb093814cb56440fe2d78ab nvidia-settings-256.35.tar.bz2
--- 03_do_not_exit_on_no_scanout.patch DELETED ---
--- nvidia-settings-1.0-default.patch DELETED ---
--- nvidia-settings-1.0-lm.patch DELETED ---
--- nvidia-settings.desktop DELETED ---
13 years, 10 months
rpms/nvidia-settings/F-13 nvidia-settings-256.35-validate.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nvidia-settings.spec, 1.4, 1.5 sources, 1.4, 1.5 03_do_not_exit_on_no_scanout.patch, 1.1, NONE nvidia-settings-1.0-default.patch, 1.1, NONE nvidia-settings-1.0-lm.patch, 1.1, NONE nvidia-settings.desktop, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25485/F-13
Modified Files:
.cvsignore nvidia-settings.spec sources
Added Files:
nvidia-settings-256.35-validate.patch
Removed Files:
03_do_not_exit_on_no_scanout.patch
nvidia-settings-1.0-default.patch nvidia-settings-1.0-lm.patch
nvidia-settings.desktop
Log Message:
Update to 256.35
nvidia-settings-256.35-validate.patch:
nvidia-settings.desktop | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE nvidia-settings-256.35-validate.patch ---
diff -up nvidia-settings-256.35/doc/nvidia-settings.desktop.validate nvidia-settings-256.35/doc/nvidia-settings.desktop
--- nvidia-settings-256.35/doc/nvidia-settings.desktop.validate 2010-06-17 05:02:48.000000000 +0200
+++ nvidia-settings-256.35/doc/nvidia-settings.desktop 2010-07-10 16:43:47.000000000 +0200
@@ -3,9 +3,9 @@ Type=Application
Encoding=UTF-8
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
-Exec=__UTILS_PATH__/nvidia-settings
-Icon=__PIXMAP_PATH__/nvidia-settings.png
-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
# Translations provided by Sun Microsystems
Name[de]=NVIDIA X-Server-Einstellungen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Apr 2010 21:44:51 -0000 1.4
+++ .cvsignore 10 Jul 2010 15:01:03 -0000 1.5
@@ -1 +1 @@
-nvidia-settings-195.36.24.tar.gz
+nvidia-settings-256.35.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/nvidia-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-settings.spec 28 Apr 2010 21:44:51 -0000 1.4
+++ nvidia-settings.spec 10 Jul 2010 15:01:03 -0000 1.5
@@ -1,23 +1,20 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.24
+%global nversion 256.35
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
-License: MIT
+License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
-Source1: nvidia-settings.desktop
-Patch0: nvidia-settings-1.0-default.patch
-Patch1: nvidia-settings-1.0-lm.patch
-Patch2: 03_do_not_exit_on_no_scanout.patch
+Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
+Patch0: nvidia-settings-256.35-validate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -39,6 +36,8 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
+Provides: %{name}-nversion = %{nversion}
+
%description
@@ -50,30 +49,35 @@
nvidia-settings is compatible with driver up to %{nversion}.
%prep
-%setup -q
-%patch0 -p1 -b .default
-%patch1 -p1 -b .lm
-%patch2 -p1 -b .noscanout
+%setup -q -n nvidia-settings-%{nversion}
+%patch0 -p1 -b .validate
rm -rf src/libXNVCtrl/libXNVCtrl.a
-sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
-sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
-sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
+sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
# no job control
-make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
+pushd src/libXNVCtrl
+ make
+popd
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE1}
+ doc/nvidia-settings.desktop
%clean
@@ -89,6 +93,11 @@
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-5
+- Update internal to 256.35
+- Use upstream desktop file (completed)
+- Provides %%{name}-nversion internal
+
* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Apr 2010 21:44:51 -0000 1.4
+++ sources 10 Jul 2010 15:01:03 -0000 1.5
@@ -1 +1 @@
-43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
+125d6c4e9eb093814cb56440fe2d78ab nvidia-settings-256.35.tar.bz2
--- 03_do_not_exit_on_no_scanout.patch DELETED ---
--- nvidia-settings-1.0-default.patch DELETED ---
--- nvidia-settings-1.0-lm.patch DELETED ---
--- nvidia-settings.desktop DELETED ---
13 years, 10 months
rpms/nvidia-settings/devel nvidia-settings-256.35-validate.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 nvidia-settings.spec, 1.4, 1.5 sources, 1.4, 1.5 nvidia-settings.desktop, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24920/devel
Modified Files:
.cvsignore nvidia-settings.spec sources
Added Files:
nvidia-settings-256.35-validate.patch
Removed Files:
nvidia-settings.desktop
Log Message:
Update to 256.35
nvidia-settings-256.35-validate.patch:
nvidia-settings.desktop | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE nvidia-settings-256.35-validate.patch ---
diff -up nvidia-settings-256.35/doc/nvidia-settings.desktop.validate nvidia-settings-256.35/doc/nvidia-settings.desktop
--- nvidia-settings-256.35/doc/nvidia-settings.desktop.validate 2010-06-17 05:02:48.000000000 +0200
+++ nvidia-settings-256.35/doc/nvidia-settings.desktop 2010-07-10 16:43:47.000000000 +0200
@@ -3,9 +3,9 @@ Type=Application
Encoding=UTF-8
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
-Exec=__UTILS_PATH__/nvidia-settings
-Icon=__PIXMAP_PATH__/nvidia-settings.png
-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
+Exec=nvidia-settings
+Icon=nvidia-settings
+Categories=System;Settings;
# Translations provided by Sun Microsystems
Name[de]=NVIDIA X-Server-Einstellungen
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Apr 2010 21:41:49 -0000 1.4
+++ .cvsignore 10 Jul 2010 15:00:26 -0000 1.5
@@ -1 +1 @@
-nvidia-settings-195.36.24.tar.gz
+nvidia-settings-256.35.tar.bz2
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nvidia-settings.spec 28 Apr 2010 21:41:49 -0000 1.4
+++ nvidia-settings.spec 10 Jul 2010 15:00:26 -0000 1.5
@@ -1,23 +1,20 @@
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
-%global nversion 195.36.24
+%global nversion 256.35
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
-License: MIT
+License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
-Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
-Source1: nvidia-settings.desktop
-Patch0: nvidia-settings-1.0-default.patch
-Patch1: nvidia-settings-1.0-lm.patch
-Patch2: 03_do_not_exit_on_no_scanout.patch
+Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
+Patch0: nvidia-settings-256.35-validate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -39,6 +36,8 @@
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
+Provides: %{name}-nversion = %{nversion}
+
%description
@@ -50,30 +49,35 @@
nvidia-settings is compatible with driver up to %{nversion}.
%prep
-%setup -q
-%patch0 -p1 -b .default
-%patch1 -p1 -b .lm
-%patch2 -p1 -b .noscanout
+%setup -q -n nvidia-settings-%{nversion}
+%patch0 -p1 -b .validate
rm -rf src/libXNVCtrl/libXNVCtrl.a
-sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
-sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
-sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
+sed -i -e 's|/usr/local|$(DESTDIR)/%{_prefix}|g' utils.mk
+sed -i -e 's|-lXxf86vm|-lXxf86vm -ldl -lm|g' Makefile
%build
# no job control
-make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
+pushd src/libXNVCtrl
+ make
+popd
+make \
+ NVDEBUG=1 \
+ NV_VERBOSE=1 \
+ X_LDFLAGS="-L%{_libdir}" \
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
-make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
- %{SOURCE1}
+ doc/nvidia-settings.desktop
%clean
@@ -89,6 +93,11 @@
%changelog
+* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-5
+- Update internal to 256.35
+- Use upstream desktop file (completed)
+- Provides %%{name}-nversion internal
+
* Wed Apr 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-4
- Update internal to 195.36.24
- Avoid failure on NV_CTRL_NO_SCANOUT when not supported in legacy drivers.
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Apr 2010 21:41:49 -0000 1.4
+++ sources 10 Jul 2010 15:00:26 -0000 1.5
@@ -1 +1 @@
-43008cf2cec84fa27ee6f315845d50f7 nvidia-settings-195.36.24.tar.gz
+125d6c4e9eb093814cb56440fe2d78ab nvidia-settings-256.35.tar.bz2
--- nvidia-settings.desktop DELETED ---
13 years, 10 months
rpms/k3b-extras-freeworld/devel .cvsignore, 1.9, 1.10 k3b-extras-freeworld.spec, 1.19, 1.20 sources, 1.9, 1.10
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7192
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Log Message:
* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
- k3b-2.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 23 May 2010 19:25:25 -0000 1.9
+++ .cvsignore 10 Jul 2010 10:42:26 -0000 1.10
@@ -1 +1 @@
-k3b-1.92.0rc3.tar.bz2
+k3b-2.0.0.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- k3b-extras-freeworld.spec 23 May 2010 19:25:25 -0000 1.19
+++ k3b-extras-freeworld.spec 10 Jul 2010 10:42:26 -0000 1.20
@@ -1,16 +1,14 @@
-%define pre rc3
-
Name: k3b-extras-freeworld
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
-Version: 1.92.0
+Version: 2.0.0
Release: 1%{?dist}
Group: Applications/Archiving
License: GPLv2+
URL: http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar...
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.ta...
# fix build with FFmpeg 0.6 snapshots (define __STDC_CONSTANT_MACROS)
Patch1: k3b-1.91.0-ffmpeg06.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,6 +92,9 @@
%changelog
+* Sat Jul 10 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:2.0.0-1
+- k3b-2.0.0
+
* Sun May 23 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.92.0-1
- k3b-1.92.0 (rc3)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 23 May 2010 19:25:25 -0000 1.9
+++ sources 10 Jul 2010 10:42:26 -0000 1.10
@@ -1 +1 @@
-65372e9f2826165071b24c9f1d17882b k3b-1.92.0rc3.tar.bz2
+2ec161ccd6c24778d4c5289c85473747 k3b-2.0.0.tar.bz2
13 years, 10 months