rpms/fglrx-kmod/F-10 fglrx-kmod.spec,1.16,1.17
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8840/F-10
Modified Files:
fglrx-kmod.spec
Log Message:
Patch out /lib/modules/$(KVER)/build since it doesn't exist unless kernel-$(KVER) is also installed
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/fglrx-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fglrx-kmod.spec 16 Dec 2008 17:40:11 -0000 1.16
+++ fglrx-kmod.spec 16 Dec 2008 18:41:56 -0000 1.17
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.561
-Release: 1.%{ativersion}%{?dist}
+Release: 2.%{ativersion}%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -23,6 +23,7 @@
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Source0: http://downloads.diffingo.com/livna/kmod-data/fglrx-kmod-data-%{version}....
Source11: fglrx-kmodtool-excludekernel-filterfile
+Patch0: makefile-kver-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,8 @@
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
+%patch0
+
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
@@ -94,6 +97,9 @@
%changelog
+* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-2.8.12
+- Don't use /lib/modules/$KVER/build, patch in /usr/src/kernels/$KVER instead
+
* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
- Update to 8.12
- Remove unneeded makefile patch
15 years, 11 months
rpms/fglrx-kmod/devel fglrx-kmod.spec,1.15,1.16
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8840/devel
Modified Files:
fglrx-kmod.spec
Log Message:
Patch out /lib/modules/$(KVER)/build since it doesn't exist unless kernel-$(KVER) is also installed
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/devel/fglrx-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fglrx-kmod.spec 14 Dec 2008 18:07:39 -0000 1.15
+++ fglrx-kmod.spec 16 Dec 2008 18:41:56 -0000 1.16
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.561
-Release: 1.%{ativersion}%{?dist}.1
+Release: 2.%{ativersion}%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -23,6 +23,7 @@
URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
Source0: http://downloads.diffingo.com/livna/kmod-data/fglrx-kmod-data-%{version}....
Source11: fglrx-kmodtool-excludekernel-filterfile
+Patch0: makefile-kver-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,8 @@
sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
%endif
+%patch0
+
mkdir fglrxpkg
%ifarch %{ix86}
cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
@@ -94,6 +97,9 @@
%changelog
+* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-2.8.12
+- Don't use /lib/modules/$KVER/build, patch in /usr/src/kernels/$KVER instead
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-1.8.12.1
- rebuild for latest Fedora kernel;
15 years, 11 months
rpms/xmms2-freeworld/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvszv8399/rpms/xmms2-freeworld/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module xmms2-freeworld
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: xmms2-freeworld
# $Id: Makefile,v 1.1 2008/12/16 18:30:55 thl Exp $
NAME := xmms2-freeworld
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 11 months
rpms/xmms2-freeworld Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xmms2-freeworld
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvszv8399/rpms/xmms2-freeworld
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module xmms2-freeworld
--- NEW FILE Makefile ---
# Top level Makefile for module xmms2-freeworld
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
15 years, 11 months
rpms/xmms2-freeworld - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xmms2-freeworld
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvszv8399/rpms/xmms2-freeworld
Log Message:
Directory /cvs/free/rpms/xmms2-freeworld added to the repository
15 years, 11 months
rpms/xmms2-freeworld/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/free/owners/tmpcvszv8399/rpms/xmms2-freeworld/devel
Log Message:
Directory /cvs/free/rpms/xmms2-freeworld/devel added to the repository
15 years, 11 months
rpms/fglrx-kmod/F-10 sources,1.4,1.5
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7323/F-10
Modified Files:
sources
Log Message:
Fix sources file
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Dec 2008 17:40:11 -0000 1.4
+++ sources 16 Dec 2008 18:15:44 -0000 1.5
@@ -1 +1 @@
-9fe72622140a2831475ee26ce9d32217da62d53c fglrx-kmod-data-8.561.tar.bz2
+f26a00b32e3d190cf630eda54d5c3410 fglrx-kmod-data-8.561.tar.bz2
15 years, 11 months
rpms/fglrx-kmod/F-9 fglrx-kmod.spec,1.11,1.12 sources,1.3,1.4
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/fglrx-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7323/F-9
Modified Files:
fglrx-kmod.spec sources
Log Message:
Fix sources file
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/fglrx-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fglrx-kmod.spec 16 Dec 2008 17:40:11 -0000 1.11
+++ fglrx-kmod.spec 16 Dec 2008 18:15:44 -0000 1.12
@@ -15,7 +15,7 @@
Name: fglrx-kmod
Version: 8.561
-Release: 1.%{ativersion}%{?dist}
+Release: 1.%{ativersion}%{?dist}.1
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -94,6 +94,9 @@
%changelog
+* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12.1
+- Fix sources file (contained sha1sum instead of md5sum)
+
* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
- Update to 8.12
- Remove unneeded makefile patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Dec 2008 17:40:11 -0000 1.3
+++ sources 16 Dec 2008 18:15:44 -0000 1.4
@@ -1 +1 @@
-9fe72622140a2831475ee26ce9d32217da62d53c fglrx-kmod-data-8.561.tar.bz2
+f26a00b32e3d190cf630eda54d5c3410 fglrx-kmod-data-8.561.tar.bz2
15 years, 11 months
rpms/xorg-x11-drv-fglrx/F-9 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 xorg-x11-drv-fglrx.spec, 1.8, 1.9
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5117/F-9
Modified Files:
.cvsignore sources xorg-x11-drv-fglrx.spec
Log Message:
Update to Catalyst 8.12
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Oct 2008 18:14:58 -0000 1.2
+++ .cvsignore 16 Dec 2008 17:43:43 -0000 1.3
@@ -1 +1 @@
-fglrx-installer_8.543.orig.tar.gz
+ati-driver-installer-8-12-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Oct 2008 18:14:58 -0000 1.3
+++ sources 16 Dec 2008 17:43:43 -0000 1.4
@@ -1 +1 @@
-6abc8e86f1a00168ba8f43d58f71cb69 fglrx-installer_8.543.orig.tar.gz
+2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-fglrx.spec 4 Nov 2008 17:36:05 -0000 1.8
+++ xorg-x11-drv-fglrx.spec 16 Dec 2008 17:43:43 -0000 1.9
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.11beta
+%define ativersion 8.12
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,14 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.543
-Release: 0.6.%{ativersion}%{?dist}
+Version: 8.561
+Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-#Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
-Source0: http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -49,6 +48,9 @@
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
Obsoletes: fglrx-kmod < %{version}
# ATI auto-generated RPMs
@@ -100,14 +102,7 @@
%prep
%setup -q -c -T
-#sh %{SOURCE0} --extract fglrx
-mkdir -p fglrx/common
-pushd fglrx
-tar xfz %{SOURCE0}
-mv etc lib opt usr common
-cp common/usr/share/doc/fglrx/ATI_LICENSE.TXT .
-popd
-
+sh %{SOURCE0} --extract fglrx
tar -cjf fglrx-kmod-data-%{version}.tar.bz2 fglrx/ATI_LICENSE.TXT fglrx/common/*/modules/fglrx/ fglrx/arch/*/*/modules/fglrx/
# Tweak to have debuginfo - part 2/2
@@ -118,12 +113,10 @@
mkdir fglrxpkg
%ifarch %{ix86}
-#cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/
%endif
%ifarch x86_64
-#cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
%endif
@@ -162,14 +155,12 @@
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
- #elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
- #then
- # atilibdir32bit doesn't exist anymore; we do multiarch builds instead (ie "make i386" catches these files)
- # #install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir32bit}/${file##./usr/X11R6/lib/}
- # continue
elif [[ ! "/${file##./usr/X11R6/bin/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_bindir}/${file##./usr/X11R6/bin/}
@@ -310,6 +301,10 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Tue Dec 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
+- Update to 8.12
+- Add Conflicts: for new nvidia packages
+
* 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
15 years, 11 months
rpms/xorg-x11-drv-fglrx/F-10 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 xorg-x11-drv-fglrx.spec, 1.9, 1.10
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5117/F-10
Modified Files:
.cvsignore sources xorg-x11-drv-fglrx.spec
Log Message:
Update to Catalyst 8.12
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 17 Nov 2008 17:24:44 -0000 1.3
+++ .cvsignore 16 Dec 2008 17:43:43 -0000 1.4
@@ -1 +1 @@
-ati-driver-installer-8-11-x86.x86_64.run
+ati-driver-installer-8-12-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Nov 2008 17:24:44 -0000 1.4
+++ sources 16 Dec 2008 17:43:43 -0000 1.5
@@ -1 +1 @@
-9774452430dae8fd8b27eb6379da2e16 ati-driver-installer-8-11-x86.x86_64.run
+2a62d8c5173f091379e458371782a580 ati-driver-installer-8-12-x86.x86_64.run
Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-10/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-fglrx.spec 17 Nov 2008 17:24:44 -0000 1.9
+++ xorg-x11-drv-fglrx.spec 16 Dec 2008 17:43:43 -0000 1.10
@@ -1,5 +1,5 @@
%define atilibdir %{_libdir}/fglrx
-%define ativersion 8.11
+%define ativersion 8.12
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
%endif
Name: xorg-x11-drv-fglrx
-Version: 8.552
+Version: 8.561
Release: 1.%{ativersion}%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: BSD/Commercial/GPL/QPL
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0: https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: fglrx-README.Fedora
Source3: fglrx-config-display
Source4: fglrx-init
@@ -48,6 +48,9 @@
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
Obsoletes: fglrx-kmod < %{version}
# ATI auto-generated RPMs
@@ -57,8 +60,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
@@ -153,6 +156,9 @@
elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
then
install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
then
install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
@@ -296,6 +302,10 @@
%{_includedir}/X11/extensions/*.h
%changelog
+* Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
+- Update to 8.12
+- Add Conflicts: for new nvidia packages
+
* Mon Nov 17 2008 Stewart Adam <s.adam at diffingo.com> - 8.552-1.8.11
- Update to 8.11
15 years, 11 months