rpms/xorg-x11-drv-radeonhd/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xorg-x11-drv-radeonhd-snapshot.sh, 1.1, 1.2 xorg-x11-drv-radeonhd.spec, 1.1, 1.2 xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch, 1.1, NONE

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5357

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-snapshot.sh 
	xorg-x11-drv-radeonhd.spec 
Removed Files:
	xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch 
Log Message:
* Wed Oct 17 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.7.20071017git
- New snapshot (upstream commit d03841b4950b3b827b3c42507e01767d0569391f).
- Use upstream's version 0.0.2.
- Trade in ThinkPad backlight key fix for non-broken mode on lid event.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2007 20:47:10 -0000	1.2
+++ .cvsignore	17 Oct 2007 19:30:03 -0000	1.3
@@ -1 +1 @@
-xf86-video-radeonhd-0.0.1-20071015git.tar.bz2
+xf86-video-radeonhd-0.0.2-20071017git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2007 20:47:10 -0000	1.2
+++ sources	17 Oct 2007 19:30:03 -0000	1.3
@@ -1 +1 @@
-8c51846e2c1c49a6ef3d4e4828f24ede  xf86-video-radeonhd-0.0.1-20071015git.tar.bz2
+0ec4cca976c5cdd47055db93f1ad5cec  xf86-video-radeonhd-0.0.2-20071017git.tar.bz2


Index: xorg-x11-drv-radeonhd-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-radeonhd-snapshot.sh	16 Oct 2007 20:47:10 -0000	1.1
+++ xorg-x11-drv-radeonhd-snapshot.sh	17 Oct 2007 19:30:03 -0000	1.2
@@ -35,9 +35,12 @@
     git clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}"
 fi
 
+# Determine latest upstream commit:
+upstream_commit="$(cd xf86-video-radeonhd.src && git log | head -n1 | cut -d' ' -f2)"
+
 # This commit break the brightness settings
-( cd "${srcdir}" && git diff 1103f74dc04e80f47a84367771e6b981d6a902ac 1103f74dc04e80f47a84367771e6b981d6a902ac^ ) \
-	> "${name}-fix-thinkpad-backlight-keys.patch"
+#( cd "${srcdir}" && git diff 1103f74dc04e80f47a84367771e6b981d6a902ac 1103f74dc04e80f47a84367771e6b981d6a902ac^ ) \
+#	> "${name}-fix-thinkpad-backlight-keys.patch"
 
 # If possible, create a few patches from our local development branch
 # which are pending for inclusion in upstream.
@@ -62,16 +65,16 @@
 autoreconf -vis "${srcdir}"
 mkdir "${builddir}"
 ( cd "${builddir}" && ../${srcdir}/configure )
-# Until upstream have figured out their version mess, we'll just stay at 0.0.1
-# version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
-version="0.0.1"
+version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
 tarname="${tarbase}-${version}-${date}git"
-make -C "${builddir}" dist distdir="${tarname}"
+make -C "${builddir}" distcheck distdir="${tarname}"
 mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2"
 
 # Update spec file with the proper timestamp
 if [ "x$1" = "x--update-spec" ]; then
-    sed "s/%define date .*/%define date ${date}/" "$specfile" > "$specfile.new"
+    sed -e "s/^%define date .*/%define date ${date}/" \
+        -e "s/^Version:.*/Version:       ${version}/" \
+        "$specfile" > "$specfile.new"
     if cmp "${specfile}.new" "${specfile}"; then
 	rm -f "${specfile},new"
     else
@@ -82,3 +85,5 @@
 # Clean up after us
 (cd "${srcdir}" && git reset --hard origin)
 rm -rf "${builddir}"
+
+echo "Latest upstream commit: ${upstream_commit}"


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/devel/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-radeonhd.spec	16 Oct 2007 20:47:10 -0000	1.1
+++ xorg-x11-drv-radeonhd.spec	17 Oct 2007 19:30:03 -0000	1.2
@@ -11,7 +11,7 @@
 %define snapshot 1
 
 %if 0%{snapshot}
-%define date 20071015
+%define date 20071017
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %else
@@ -20,8 +20,8 @@
 
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
-Version:       0.0.1
-Release:       0.6%{?alphatag}%{?dist}
+Version:       0.0.2
+Release:       0.7%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -45,7 +45,7 @@
 
 # This patch is also generated by xorg-x11-drv-radeonhd-snapshot.sh
 # cf. http://lists.opensuse.org/radeonhd/2007-10/msg00247.html
-Patch0:        xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch
+# Patch0:        xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch
 
 ExcludeArch:   s390 s390x
 
@@ -63,7 +63,7 @@
 
 %prep
 %setup -q -n %{tarball}
-%patch0 -p1 -b .fix-thinkpad-backlight-keys
+#%patch0 -p1 -b .fix-thinkpad-backlight-keys
 
 %build
 %{configure} --with-xorg-module-dir=%{moduledir} --disable-static
@@ -86,6 +86,11 @@
 %{driverdir}/radeonhd_drv.so
 
 %changelog
+* Wed Oct 17 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.2-0.7.20071017git
+- New snapshot (upstream commit d03841b4950b3b827b3c42507e01767d0569391f).
+- Use upstream's version 0.0.2.
+- Trade in ThinkPad backlight key fix for non-broken mode on lid event.
+
 * Mon Oct 15 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.0.1-0.6.20071015git
 - Hard-code version at 0.0.1 until upstream have figured out what they want.
 - Names of snapshot tarballs now contain timestamp.


--- xorg-x11-drv-radeonhd-fix-thinkpad-backlight-keys.patch DELETED ---