rpms/buildsys-build-rpmfusion/F-9 update-to-latest-kernels.sh, NONE, 1.1 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.2, 1.3 buildsys-build-rpmfusion-kerneldevpkgs-newest, 1.2, 1.3 buildsys-build-rpmfusion.spec, 1.4, 1.5
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5666
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion-kerneldevpkgs-newest
buildsys-build-rpmfusion.spec
Added Files:
update-to-latest-kernels.sh
Log Message:
* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9:9.1-17
- rebuild for kernels 2.6.25.3-2.fc9xen 2.6.27.4-19.fc9
--- NEW FILE update-to-latest-kernels.sh ---
#! /bin/bash
print_kernellist()
{
echo ${1}
echo ${1}smp
echo ${1}PAE
}
if [[ ! "${1}" ]] || [[ ! "${2}" ]] ; then
echo "Please call with list of latest standard and xen kernel versions" >&2
exit 1
fi
if [[ ! "${RPM_PACKAGER}" ]] ; then
echo "Please set RPM_PACKAGER for rpmdev-bumpspec" >&2
exit 1
fi
# update spec file
rpmdev-bumpspec -c "- rebuild for kernels ${1} ${2}" *.spec
listofnewkernels=
listofcurrentkernels="$(cat buildsys-build-rpmfusion-kerneldevpkgs-current)"
new=0
while [[ "${1}" ]] ; do
if [[ "${1}" != "${1%%xen}" ]]; then
# this is a xen kernel
if ! echo "${listofcurrentkernels}" | grep "${1}" &> /dev/null
then
# xen kernel is new! remove the old one and put and the new one in
listofcurrentkernels="$(echo "${listofcurrentkernels}" | grep -v -e "xen$")"$'\n'"${1}"
listofnewkernels="${listofnewkernels}${1}"
let new++
fi
else
# this is a standard kernel
if ! echo "${listofcurrentkernels}" | grep "${1}" &> /dev/null
then
# standard kernel is new! put the old ones put and the new ones in
listofcurrentkernels="$(echo "${listofcurrentkernels}" | grep "xen")"$'\n'"${1}"$'\n'"${1}PAE"$'\n'"${1}smp"
listofnewkernels="${listofnewkernels}${1}"$'\n'"${1}PAE"$'\n'"${1}smp"
let new++
fi
fi
shift
done
echo "${listofcurrentkernels}" > buildsys-build-rpmfusion-kerneldevpkgs-current
if (( ${new} < 2 )); then
echo "${listofnewkernels}" > buildsys-build-rpmfusion-kerneldevpkgs-newest
else
: > buildsys-build-rpmfusion-kerneldevpkgs-newest
fi
cvs diff -u | less
echo hit enter to continue
read
make clog; cvs commit -F clog
rm clog
make tag build
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-9/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildsys-build-rpmfusion-kerneldevpkgs-current 23 Oct 2008 18:48:01 -0000 1.2
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 6 Nov 2008 10:59:29 -0000 1.3
@@ -1,4 +1,4 @@
2.6.25.3-2.fc9xen
-2.6.26.6-79.fc9
-2.6.26.6-79.fc9PAE
-2.6.26.6-79.fc9smp
+2.6.27.4-19.fc9
+2.6.27.4-19.fc9PAE
+2.6.27.4-19.fc9smp
Index: buildsys-build-rpmfusion-kerneldevpkgs-newest
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-9/buildsys-build-rpmfusion-kerneldevpkgs-newest,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildsys-build-rpmfusion-kerneldevpkgs-newest 23 Oct 2008 18:48:01 -0000 1.2
+++ buildsys-build-rpmfusion-kerneldevpkgs-newest 6 Nov 2008 10:59:29 -0000 1.3
@@ -1,3 +1,3 @@
-2.6.26.6-79.fc9
-2.6.26.6-79.fc9PAE
-2.6.26.6-79.fc9smp
+2.6.27.4-19.fc9
+2.6.27.4-19.fc9PAE
+2.6.27.4-19.fc9smp
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-9/buildsys-build-rpmfusion.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildsys-build-rpmfusion.spec 23 Oct 2008 18:48:01 -0000 1.4
+++ buildsys-build-rpmfusion.spec 6 Nov 2008 10:59:29 -0000 1.5
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 9
Version: 9.1
-Release: 16
+Release: 17
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -126,6 +126,9 @@
%changelog
+* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9:9.1-17
+- rebuild for kernels 2.6.25.3-2.fc9xen 2.6.27.4-19.fc9
+
* Thu Oct 23 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 9.1-16
- Update to latest kernels 2.6.26.6-79.fc9 2.6.25.3-2.fc9xen
15 years, 5 months
rpms/compat-plone/F-9 compat-plone.spec,1.1,1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/compat-plone/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20522
Modified Files:
compat-plone.spec
Log Message:
* Wed Nov 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.4-2.1
- rebuilt
Index: compat-plone.spec
===================================================================
RCS file: /cvs/free/rpms/compat-plone/F-9/compat-plone.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-plone.spec 10 Aug 2008 10:28:56 -0000 1.1
+++ compat-plone.spec 5 Nov 2008 08:03:48 -0000 1.2
@@ -6,7 +6,7 @@
Name: compat-plone
Version: 3.1.4
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: User friendly and powerful open source Content Management System
License: GPLv2+
Group: System Environment/Daemons
@@ -63,6 +63,9 @@
%{software_home}/borg/
%changelog
+* Wed Nov 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.1.4-2.1
+- rebuilt
+
* Sun Aug 10 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.1.4-2
- rebuild for RPM Fusion
15 years, 5 months
rpms/xorg-x11-drv-fglrx/F-9 xorg-x11-drv-fglrx.spec,1.7,1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-fglrx/F-9
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-fglrx.spec 4 Nov 2008 17:05:22 -0000 1.7
+++ xorg-x11-drv-fglrx.spec 4 Nov 2008 17:36:05 -0000 1.8
@@ -58,8 +58,8 @@
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
-Obsoletes: ati-x11-drv < %{version}-%{release}
-Provides: ati-x11-drv = %{version}-%{release}
+Obsoletes: ati-x11-drv < %{version}-%{release}
+Provides: ati-x11-drv = %{version}-%{release}
%description
This package provides the most recent proprietary AMD display driver which
@@ -77,8 +77,8 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: %{_includedir}/X11/extensions, %{_includedir}/GL
-Obsoletes: ati-x11-drv-devel < %{version}-%{release}
-Provides: ati-x11-drv-devel = %{version}-%{release}
+Obsoletes: ati-x11-drv-devel < %{version}-%{release}
+Provides: ati-x11-drv-devel = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
@@ -88,6 +88,7 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
@@ -311,6 +312,7 @@
%changelog
* Mon Nov 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.6.8.11beta
- Fix upgrade path for FreshRPMs users
+- Revert the libs dep change
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.5.8.11beta
- Remove the libs subpackage's dependency on main package
@@ -330,7 +332,7 @@
* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta
- Update to 8.11 beta (8.54.3)
-* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-1.8.10
- Update to 8.10
* Sat Sep 21 2008 Stewart Adam <s.adam at diffingo.com> - 8.532-1.8.09
15 years, 5 months
rpms/xorg-x11-drv-fglrx/devel xorg-x11-drv-fglrx.spec,1.7,1.8
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-fglrx/devel
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-fglrx.spec 4 Nov 2008 17:05:22 -0000 1.7
+++ xorg-x11-drv-fglrx.spec 4 Nov 2008 17:36:05 -0000 1.8
@@ -58,8 +58,8 @@
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
-Obsoletes: ati-x11-drv < %{version}-%{release}
-Provides: ati-x11-drv = %{version}-%{release}
+Obsoletes: ati-x11-drv < %{version}-%{release}
+Provides: ati-x11-drv = %{version}-%{release}
%description
This package provides the most recent proprietary AMD display driver which
@@ -77,8 +77,8 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: %{_includedir}/X11/extensions, %{_includedir}/GL
-Obsoletes: ati-x11-drv-devel < %{version}-%{release}
-Provides: ati-x11-drv-devel = %{version}-%{release}
+Obsoletes: ati-x11-drv-devel < %{version}-%{release}
+Provides: ati-x11-drv-devel = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
@@ -88,6 +88,7 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
@@ -311,6 +312,7 @@
%changelog
* Mon Nov 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.6.8.11beta
+- Revert the libs dep change
- Fix upgrade path for FreshRPMs users
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.5.8.11beta
15 years, 5 months
rpms/xorg-x11-drv-nvidia-96xx/F-8 xorg-x11-drv-nvidia-96xx.spec, 1.3, 1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-nvidia-96xx/F-8
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-8/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-nvidia-96xx.spec 25 Oct 2008 17:09:03 -0000 1.3
+++ xorg-x11-drv-nvidia-96xx.spec 4 Nov 2008 17:36:06 -0000 1.4
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.07
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -59,6 +59,9 @@
Obsoletes: nvidia-96xx-kmod < %{version}
+Obsoletes: nvidia-x11-drv-96xx < %{version}-%{release}
+Provides: nvidia-x11-drv-96xx = %{version}-%{release}
+
%description
This package provides the most recent NVIDIA display driver of the 1.0-96xx
series which allows for hardware accelerated rendering with NVIDIA chipsets
@@ -81,6 +84,7 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
@@ -288,6 +292,12 @@
%changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-6
+- Fix upgrade path for FreshRPMs users
+
+* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-5
+- Revert the libs dep change
+
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-4
- Remove the libs subpackage's dependency on main package
15 years, 5 months
rpms/xorg-x11-drv-nvidia-96xx/devel xorg-x11-drv-nvidia-96xx.spec, 1.1, 1.2
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-nvidia-96xx/devel
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-nvidia-96xx.spec 30 Oct 2008 13:30:02 -0000 1.1
+++ xorg-x11-drv-nvidia-96xx.spec 4 Nov 2008 17:36:06 -0000 1.2
@@ -6,60 +6,63 @@
%{nil}
%endif
-Name: xorg-x11-drv-nvidia-96xx
-Version: 96.43.09
-Release: 1%{?dist}
-Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
-
-Group: User Interface/X Hardware Support
-License: Redistributable, no modification permitted
-URL: http://www.nvidia.com/
-#Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
-#Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
-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...
-Source2: nvidia-96xx.sh
-Source3: nvidia-96xx.csh
-Source4: nvidia-settings.desktop
-Source5: nvidia-96xx-init
-Source6: 60-nvidia.nodes
-Source10: nvidia-96xx-config-display
-Source11: nvidia-96xx-README.Fedora
-Source12: nvidia-96xx.opts
+Name: xorg-x11-drv-nvidia-96xx
+Version: 96.43.09
+Release: 2%{?dist}
+Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+#Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+#Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+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...
+Source2: nvidia-96xx.sh
+Source3: nvidia-96xx.csh
+Source4: nvidia-settings.desktop
+Source5: nvidia-96xx-init
+Source6: 60-nvidia.nodes
+Source10: nvidia-96xx-config-display
+Source11: nvidia-96xx-README.Fedora
+Source12: nvidia-96xx.opts
# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
+Source91: filter-requires.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i386 x86_64
-Requires: nvidia-96xx-kmod >= %{version}
+Requires: nvidia-96xx-kmod >= %{version}
Requires(post): nvidia-96xx-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
-Requires: which
-Requires: livna-config-display
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
-
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
-Requires(post): ldconfig
-Requires(preun): chkconfig
-
-Provides: nvidia-96xx-kmod-common = %{version}
-
-Conflicts: xorg-x11-drv-nvidia-legacy
-Conflicts: xorg-x11-drv-nvidia-beta
-Conflicts: xorg-x11-drv-nvidia-newest
-Conflicts: xorg-x11-drv-nvidia-173xx
-Conflicts: xorg-x11-drv-nvidia-71xx
-Conflicts: xorg-x11-drv-nvidia
-Conflicts: xorg-x11-drv-fglrx
+BuildRequires: desktop-file-utils
+Requires: which
+Requires: livna-config-display
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-96xx-kmod-common = %{version}
+
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-71xx
+Conflicts: xorg-x11-drv-nvidia
+Conflicts: xorg-x11-drv-fglrx
-Obsoletes: nvidia-96xx-kmod < %{version}
+Obsoletes: nvidia-96xx-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-96xx < %{version}-%{release}
+Provides: nvidia-x11-drv-96xx = %{version}-%{release}
%description
This package provides the most recent NVIDIA display driver of the 1.0-96xx
@@ -72,22 +75,22 @@
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
such as OpenGL headers.
%package libs
-Summary: Libraries for %{name}
-Group: User Interface/X Hardware Support
-Requires: %{name} = %{version}-%{release}
-Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%ifarch %{ix86}
-Provides: %{name}-libs-32bit = %{version}-%{release}
-Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
%endif
%description libs
@@ -292,6 +295,9 @@
%changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.09-2
+- Fix upgrade path for FreshRPMs users
+
* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
- Update to 96.43.09 (beta)
Preliminary support for xorg-server 1.5
15 years, 5 months
rpms/xorg-x11-drv-fglrx/F-8 xorg-x11-drv-fglrx.spec,1.6,1.7
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-fglrx/F-8
Modified Files:
xorg-x11-drv-fglrx.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-fglrx.spec 4 Nov 2008 17:05:22 -0000 1.6
+++ xorg-x11-drv-fglrx.spec 4 Nov 2008 17:36:05 -0000 1.7
@@ -57,8 +57,8 @@
Conflicts: kernel-module-ATI-fglrx
Conflicts: ATI-fglrx-IA32-libs
-Obsoletes: ati-x11-drv < %{version}-%{release}
-Provides: ati-x11-drv = %{version}-%{release}
+Obsoletes: ati-x11-drv < %{version}-%{release}
+Provides: ati-x11-drv = %{version}-%{release}
%description
This package provides the most recent proprietary AMD display driver which
@@ -76,8 +76,8 @@
Requires: %{name}-libs = %{version}-%{release}
Requires: %{_includedir}/X11/extensions, %{_includedir}/GL
-Obsoletes: ati-x11-drv-devel < %{version}-%{release}
-Provides: ati-x11-drv-devel = %{version}-%{release}
+Obsoletes: ati-x11-drv-devel < %{version}-%{release}
+Provides: ati-x11-drv-devel = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
@@ -87,6 +87,7 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
@@ -304,6 +305,7 @@
* Mon Nov 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-5.8.10
- Fix upgrade path for FreshRPMs users
- Fix changelog versions
+- Revert the libs dep change
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-4.8.10
- Remove the libs subpackage's dependency on main package
15 years, 5 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.5,1.6
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-nvidia/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-nvidia.spec 25 Oct 2008 17:09:03 -0000 1.5
+++ xorg-x11-drv-nvidia.spec 4 Nov 2008 17:36:05 -0000 1.6
@@ -6,56 +6,59 @@
%{nil}
%endif
-Name: xorg-x11-drv-nvidia
-Version: 177.80
-Release: 3%{?dist}
-Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
-
-Group: User Interface/X Hardware Support
-License: Redistributable, no modification permitted
-URL: http://www.nvidia.com/
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
-Source2: nvidia.sh
-Source3: nvidia.csh
-Source4: nvidia-settings.desktop
-Source5: nvidia-init
-Source6: 60-nvidia.nodes
-Source10: nvidia-config-display
-Source11: nvidia-README.Fedora
-Source12: nvidia.opts
+Name: xorg-x11-drv-nvidia
+Version: 177.80
+Release: 5%{?dist}
+Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+Source2: nvidia.sh
+Source3: nvidia.csh
+Source4: nvidia-settings.desktop
+Source5: nvidia-init
+Source6: 60-nvidia.nodes
+Source10: nvidia-config-display
+Source11: nvidia-README.Fedora
+Source12: nvidia.opts
# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
+Source91: filter-requires.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i386 x86_64
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
-Requires: which
-Requires: livna-config-display >= 0.0.21
-Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: desktop-file-utils
+Requires: which
+Requires: livna-config-display >= 0.0.21
+Requires: %{name}-libs = %{version}-%{release}
# to prevent i386 package being pulled first and x86_64 package being excluded
# on x86_64 systems
%ifarch x86_64
-Requires: %{nvidialibdir}/libGL.so.%{version}
+Requires: %{nvidialibdir}/libGL.so.%{version}
%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
-Requires(post): ldconfig
-Requires(preun): chkconfig
-
-Provides: nvidia-kmod-common = %{version}
-Conflicts: xorg-x11-drv-nvidia-legacy
-Conflicts: xorg-x11-drv-nvidia-96xx
-Conflicts: xorg-x11-drv-fglrx
-Obsoletes: nvidia-kmod < %{version}
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-fglrx
+Obsoletes: nvidia-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv < %{version}-%{release}
+Provides: nvidia-x11-drv = %{version}-%{release}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -67,20 +70,23 @@
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
such as OpenGL headers.
%package libs
-Summary: Libraries for %{name}
-Group: User Interface/X Hardware Support
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
-Provides: %{name}-libs-32bit = %{version}-%{release}
-Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release}
+Provides: nvidia-x11-drv-32bit = %{version}-%{release}
%endif
%description libs
@@ -309,6 +315,12 @@
%changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-5
+- Fix upgrade path for FreshRPMs users
+
+* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-4
+- Revert the libs dep change
+
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-3
- Remove the libs subpackage's dependency on main package
- Update dependency on livna-config-display
15 years, 5 months
rpms/xorg-x11-drv-nvidia/F-9 xorg-x11-drv-nvidia.spec,1.3,1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-nvidia/F-9
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-nvidia.spec 25 Oct 2008 17:09:03 -0000 1.3
+++ xorg-x11-drv-nvidia.spec 4 Nov 2008 17:36:04 -0000 1.4
@@ -6,56 +6,59 @@
%{nil}
%endif
-Name: xorg-x11-drv-nvidia
-Version: 173.14.12
-Release: 4%{?dist}
-Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
-
-Group: User Interface/X Hardware Support
-License: Redistributable, no modification permitted
-URL: http://www.nvidia.com/
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
-Source2: nvidia.sh
-Source3: nvidia.csh
-Source4: nvidia-settings.desktop
-Source5: nvidia-init
-Source6: 60-nvidia.nodes
-Source10: nvidia-config-display
-Source11: nvidia-README.Fedora
-Source12: nvidia.opts
+Name: xorg-x11-drv-nvidia
+Version: 173.14.12
+Release: 6%{?dist}
+Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+Source2: nvidia.sh
+Source3: nvidia.csh
+Source4: nvidia-settings.desktop
+Source5: nvidia-init
+Source6: 60-nvidia.nodes
+Source10: nvidia-config-display
+Source11: nvidia-README.Fedora
+Source12: nvidia.opts
# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
+Source91: filter-requires.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i386 x86_64
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
-Requires: which
-Requires: livna-config-display >= 0.0.21
-Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: desktop-file-utils
+Requires: which
+Requires: livna-config-display >= 0.0.21
+Requires: %{name}-libs = %{version}-%{release}
# to prevent i386 package being pulled first and x86_64 package being excluded
# on x86_64 systems
%ifarch x86_64
-Requires: %{nvidialibdir}/libGL.so.%{version}
+Requires: %{nvidialibdir}/libGL.so.%{version}
%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
-Requires(post): ldconfig
-Requires(preun): chkconfig
-
-Provides: nvidia-kmod-common = %{version}
-Conflicts: xorg-x11-drv-nvidia-legacy
-Conflicts: xorg-x11-drv-nvidia-96xx
-Conflicts: xorg-x11-drv-fglrx
-Obsoletes: nvidia-kmod < %{version}
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-fglrx
+Obsoletes: nvidia-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-97xx < %{version}-%{release}
+Provides: nvidia-x11-drv-97xx = %{version}-%{release}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -67,20 +70,21 @@
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
such as OpenGL headers.
%package libs
-Summary: Libraries for %{name}
-Group: User Interface/X Hardware Support
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
-Provides: %{name}-libs-32bit = %{version}-%{release}
-Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
%endif
%description libs
@@ -308,6 +312,12 @@
%changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-6
+- Fix upgrade path for FreshRPMs users
+
+* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-5
+- Revert the libs dep change
+
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-4
- Remove the libs subpackage's dependency on main package
- Update dependency on livna-config-display
15 years, 5 months
rpms/xorg-x11-drv-nvidia/F-8 xorg-x11-drv-nvidia.spec,1.3,1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8564/xorg-x11-drv-nvidia/F-8
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix freshRPMs upgrade path, revert libs change (fglrx)
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-8/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-nvidia.spec 25 Oct 2008 17:09:02 -0000 1.3
+++ xorg-x11-drv-nvidia.spec 4 Nov 2008 17:36:04 -0000 1.4
@@ -6,56 +6,59 @@
%{nil}
%endif
-Name: xorg-x11-drv-nvidia
-Version: 173.14.12
-Release: 4%{?dist}
-Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
-
-Group: User Interface/X Hardware Support
-License: Redistributable, no modification permitted
-URL: http://www.nvidia.com/
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
-Source2: nvidia.sh
-Source3: nvidia.csh
-Source4: nvidia-settings.desktop
-Source5: nvidia-init
-Source6: 60-nvidia.nodes
-Source10: nvidia-config-display
-Source11: nvidia-README.Fedora
-Source12: nvidia.opts
+Name: xorg-x11-drv-nvidia
+Version: 173.14.12
+Release: 6%{?dist}
+Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+Source2: nvidia.sh
+Source3: nvidia.csh
+Source4: nvidia-settings.desktop
+Source5: nvidia-init
+Source6: 60-nvidia.nodes
+Source10: nvidia-config-display
+Source11: nvidia-README.Fedora
+Source12: nvidia.opts
# So we don't pull other nvidia variants
-Source91: filter-requires.sh
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE91}
+Source91: filter-requires.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: i386 x86_64
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExclusiveArch: i386 x86_64
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
-BuildRequires: desktop-file-utils
-Requires: which
-Requires: livna-config-display
-Requires: %{name}-libs = %{version}-%{release}
+BuildRequires: desktop-file-utils
+Requires: which
+Requires: livna-config-display
+Requires: %{name}-libs = %{version}-%{release}
# to prevent i386 package being pulled first and x86_64 package being excluded
# on x86_64 systems
%ifarch x86_64
-Requires: %{nvidialibdir}/libGL.so.%{version}
+Requires: %{nvidialibdir}/libGL.so.%{version}
%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
-Requires(post): ldconfig
-Requires(preun): chkconfig
-
-Provides: nvidia-kmod-common = %{version}
-Conflicts: xorg-x11-drv-nvidia-legacy
-Conflicts: xorg-x11-drv-nvidia-96xx
-Conflicts: xorg-x11-drv-fglrx
-Obsoletes: nvidia-kmod < %{version}
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-fglrx
+Obsoletes: nvidia-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-97xx < %{version}-%{release}
+Provides: nvidia-x11-drv-97xx = %{version}-%{release}
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -67,20 +70,21 @@
%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
%description devel
This package provides the development files of the %{name} package,
such as OpenGL headers.
%package libs
-Summary: Libraries for %{name}
-Group: User Interface/X Hardware Support
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
%ifarch %{ix86}
-Provides: %{name}-libs-32bit = %{version}-%{release}
-Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
%endif
%description libs
@@ -308,6 +312,12 @@
%changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-6
+- Fix upgrade path for FreshRPMs users
+
+* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-5
+- Revert the libs dep change
+
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-4
- Remove the libs subpackage's dependency on main package
15 years, 5 months