rpms/xorg-x11-drv-radeonhd/F-9 .cvsignore, 1.32, 1.33 sources, 1.32, 1.33 xorg-x11-drv-radeonhd-README.fedora, 1.30, 1.31 xorg-x11-drv-radeonhd-snapshot.sh, 1.10, 1.11 xorg-x11-drv-radeonhd.spec, 1.40, 1.41

[Hans Ulrich Niedermann (ndim)]

Author: ndim

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

Modified Files:
	.cvsignore sources xorg-x11-drv-radeonhd-README.fedora 
	xorg-x11-drv-radeonhd-snapshot.sh xorg-x11-drv-radeonhd.spec 
Log Message:
* Sun Jul 13 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.4.20080713git
- Note Fedora package version in radeonhd's Xorg.N.log output.
- Snapshot generation updates spec file now
- New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff):
  - 8326ff4f: MC: Add a stub for RV770 MCIdle().
  - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest.
  - 20476754: I2C: Add DDC read out support for DDC3/4.
  - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block.
  - 4b7ce33f: Add initial support for RV770
  - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A.
  - c258c35f: conntest: test more error conditions.
  - 45961a0c: sh cmd substitution w/ backticks until git found
  - 31d76dab: Document more names for xorg/util/macros packages
  - fde79f9b: Add XORG_* macro names to docs for easy grepping
  - d44b0def: Name drivers dir "driversdir"
  - 7b3bd157: Disable unnecessary libtool CXX and F77 checks
  - cd4ed275: Fix typo in git format-patch instruction



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	30 Jun 2008 13:36:15 -0000	1.32
+++ .cvsignore	13 Jul 2008 17:06:54 -0000	1.33
@@ -1 +1 @@
-xf86-video-radeonhd-1.2.1-20080630git.tar.bz2
+xf86-video-radeonhd-1.2.1-20080713git.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources	30 Jun 2008 13:36:15 -0000	1.32
+++ sources	13 Jul 2008 17:06:54 -0000	1.33
@@ -1 +1 @@
-8d1a5a022c21e874b43f08269bb27833  xf86-video-radeonhd-1.2.1-20080630git.tar.bz2
+4895e724daf98dbd87f1c83d994990ce  xf86-video-radeonhd-1.2.1-20080713git.tar.bz2


Index: xorg-x11-drv-radeonhd-README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-README.fedora,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xorg-x11-drv-radeonhd-README.fedora	30 Jun 2008 13:36:15 -0000	1.30
+++ xorg-x11-drv-radeonhd-README.fedora	13 Jul 2008 17:06:54 -0000	1.31
@@ -11,7 +11,7 @@
 we are packaging development snapshots of upstream's git repository
 here.
 
-Latest upstream commit: c2139d8c7aed128644dcb1481426164ece0b967d
+Latest upstream commit: 8326ff4fb3d2fff74b11a5391b74866a656380ff
 
 
 Contents


Index: xorg-x11-drv-radeonhd-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd-snapshot.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-radeonhd-snapshot.sh	18 Jun 2008 10:38:26 -0000	1.10
+++ xorg-x11-drv-radeonhd-snapshot.sh	13 Jul 2008 17:06:54 -0000	1.11
@@ -20,6 +20,10 @@
 EOF
 )"
 
+GIT="${GIT-git}"
+RPM="${RPM-rpm}"
+SED="${SED-sed}"
+
 # Local settings
 name="xorg-x11-drv-radeonhd"
 tarbase="xf86-video-radeonhd"
@@ -37,10 +41,20 @@
     exit 1
 fi
 
-# Parse command line options
+# Default settings
+maintainer_name="Main Tainer"
+maintainer_mail="main at tainer.invalid"
+
 opt_update_config="false"
 opt_skip_pull="false"
 opt_no_checks="false"
+
+# Pull in settings, overriding the defaults
+if test -f "$(dirname "$0")/.snapshot.cfg"; then
+    . "$(dirname "$0")/.snapshot.cfg"
+fi
+
+# Parse command line options
 for opt
 do
     case "$opt" in
@@ -64,7 +78,7 @@
     old="$1"
     new="$1.new"
     shift
-    if sed "$@" < "${old}" > "${new}"; then
+    if $SED "$@" < "${old}" > "${new}"; then
 	if cmp "${new}" "${old}"; then :
 	else
 	    mv -f "${new}" "${old}"
@@ -75,28 +89,67 @@
 }
 
 
+# Syntax: update_changelog <SPECFILE> <old_commit_id> <new_commit_id>
+update_changelog() {
+    specfile="$1"
+    old_commit="$2"
+    new_commit="$3"
+
+    rpm_date=`date "+%a %b %d %Y"`
+
+    fullspecfile="$PWD/$specfile"
+    [ -f "$specfile" ]
+    rpm_version="$($RPM --queryformat "%{VERSION}-%{RELEASE}\n" -q --specfile "${specfile}" | $SED -n 1p | $SED 's/\.fc[0-9]$//')"
+
+    cd "$(dirname "$0")/xf86-video-radeonhd.src"
+    [ -d ".git" ]
+
+    {
+        sed '/^%changelog$/ q' "${fullspecfile}"
+        echo "* ${rpm_date} ${maintainer_name} <${maintainer_mail}> - ${rpm_version}"
+        echo "- New snapshot (upstream commit ${new_commit}):"
+        $GIT log --pretty=oneline "${old_commit}..HEAD" | $SED 's|^\(.\{8\}\)[^ ]\{1,\} |  - \1: |'
+        echo
+        sed -n '/^%changelog$/,$ p' "${fullspecfile}" | sed '1d'
+    } > "${fullspecfile}.new"
+
+    diff -U 5 "${fullspecfile}" "${fullspecfile}.new" || :
+
+    echo
+    echo "Adding changelog entry to ${specfile}."
+    echo "Enter 'n' or 'no' to abort; anything else to continue."
+    read response
+    if test "x$respose" = "xn" || test "x$response" = "xno"; then 
+        rm -f "${fullspecfile}.new"
+    else
+        mv -f "${fullspecfile}.new" "${fullspecfile}"
+    fi
+
+} # End of update_changelog() function
+
+
 # Prepare for action
 unset CDPATH
 set -ex
 
 # Update/check out source
 if [ -s "${srcdir}/.git/refs/heads/master" ]; then
-    ( cd "${srcdir}" && git reset --hard HEAD && git checkout master )
+    ( cd "${srcdir}" && $GIT reset --hard HEAD && $GIT checkout master )
     if "$opt_skip_pull"; then
 	echo "Skipping pull from upstream as requested"
     else
         # update from repo, keeping local changes separate
-	( cd "${srcdir}" && git fetch && git rebase origin ) || exit $?
+	( cd "${srcdir}" && $GIT fetch && $GIT rebase origin ) || exit $?
     fi
-    ( cd "${srcdir}" && (git branch -D "${branch}" ||:))
+    ( cd "${srcdir}" && ($GIT branch -D "${branch}" ||:))
 else
     # first checkout
-    git clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}"
+    $GIT clone "git://anongit.freedesktop.org/git/xorg/driver/${tarbase}" "${srcdir}"
 fi
-"${do_branch}" && ( cd "${srcdir}" && git checkout -b "${branch}" )
+"${do_branch}" && ( cd "${srcdir}" && $GIT checkout -b "${branch}" )
 
 # Determine latest upstream commit:
-upstream_commit="$(cd "${srcdir}" && git log | head -n1 | cut -d' ' -f2)"
+upstream_commit="$(cd "${srcdir}" && $GIT log | head -n1 | cut -d' ' -f2)"
 
 # This patch is waiting for the time when we actually need a radeonhd.xinf file.
 #    ${name}-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
@@ -112,7 +165,7 @@
 	exit 3
     fi
     if [ -s "$patch" ]; then
-	(cd "$srcdir" && git-am -3) < "$patch"
+	(cd "$srcdir" && $GIT am -3) < "$patch"
 	if test -s "${srcdir}/.dotest/patch"; then
 	    echo "Fatal: Could not cleanly apply patch \"$patch\"."
 	    exit 11
@@ -129,7 +182,7 @@
 ( cd "${builddir}" && ../${srcdir}/configure --enable-maintainer-mode)
 
 # Build dist tarball and move it to CWD
-version=`sed -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
+version=`$SED -n '/^PACKAGE_VERSION = / { s/^PACKAGE_VERSION = //;p }' "${builddir}/Makefile"`
 tarname="${tarbase}-${version}-${date}git"
 if "$opt_no_checks"; then
     disttarget="dist"
@@ -140,6 +193,7 @@
 mv -f "${builddir}/${tarname}.tar.bz2" "${tarname}.tar.bz2"
 
 # Update spec file with the proper timestamp
+old_git_commit=`$SED -n 's/^%define git_commit \(.*\)/\1/p' < "$specfile"`
 if "$opt_update_config"; then
     sed_update_cond "$specfile" \
 	-e "s/^%define git_commit .*/%define git_commit ${upstream_commit}/" \
@@ -148,11 +202,14 @@
 
     sed_update_cond "${name}-README.fedora" \
 	-e "s/^\(Latest upstream commit:\).*/\\1 ${upstream_commit}/"
+
+    update_changelog "$specfile" "$old_git_commit" "$upstream_commit"
 fi
 
 # Clean up after us (keeping the patched git branch)
 rm -rf "${builddir}"
 
-echo "Latest upstream commit: ${upstream_commit}"
+echo "Old upstream commit in spec: ${old_git_commit}"
+echo "Latest upstream commit:      ${upstream_commit}"
 echo "$ make new-sources FILES=\"${tarname}.tar.bz2\""
 


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-9/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- xorg-x11-drv-radeonhd.spec	30 Jun 2008 13:36:15 -0000	1.40
+++ xorg-x11-drv-radeonhd.spec	13 Jul 2008 17:06:54 -0000	1.41
@@ -20,8 +20,8 @@
 %endif
 
 %if %{snapshot}
-%define date 20080630
-%define git_commit c2139d8c7aed128644dcb1481426164ece0b967d
+%define date 20080713
+%define git_commit 8326ff4fb3d2fff74b11a5391b74866a656380ff
 %define alphatag .%{date}git
 %define tarball %{tarname}-%{version}-%{date}git
 %define ship_utils 1
@@ -33,7 +33,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.2.1
-Release:       3.3%{?alphatag}%{?dist}
+Release:       3.4%{?alphatag}%{?dist}
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -110,6 +110,7 @@
 %if %{snapshot}
 %patch100 -p1 -b .conntest-docrefs
 %endif
+sed -i 's|\(built from %%s\)\\n\\n"|\1\\n\\tFedora package %{name}-%{version}-%{release}\\n\\n"|' src/rhd_id.c
 
 %build
 %{configure} --with-xorg-module-dir=%{moduledir} --disable-static
@@ -159,6 +160,24 @@
 %endif
 
 %changelog
+* Sun Jul 13 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.4.20080713git
+- Note Fedora package version in radeonhd's Xorg.N.log output.
+- Snapshot generation updates spec file now
+- New snapshot (upstream commit 8326ff4fb3d2fff74b11a5391b74866a656380ff):
+  - 8326ff4f: MC: Add a stub for RV770 MCIdle().
+  - c6dcd8d1: conntest: Add support for RV770 to rhd_conntest.
+  - 20476754: I2C: Add DDC read out support for DDC3/4.
+  - 49b3782f: I2C: Read SDA/SCL mapping for RV620 and up from AtomBIOS GPIO Info block.
+  - 4b7ce33f: Add initial support for RV770
+  - 9b388fb0: DIG: Add support for ATOM_TRANSMITTER_CONFIG_LINKA_B/B_A.
+  - c258c35f: conntest: test more error conditions.
+  - 45961a0c: sh cmd substitution w/ backticks until git found
+  - 31d76dab: Document more names for xorg/util/macros packages
+  - fde79f9b: Add XORG_* macro names to docs for easy grepping
+  - d44b0def: Name drivers dir "driversdir"
+  - 7b3bd157: Disable unnecessary libtool CXX and F77 checks
+  - cd4ed275: Fix typo in git format-patch instruction
+
 * Mon Jun 30 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.1-3.3.20080630git
 - New snapshot (upstream commit c2139d8c7aed128644dcb1481426164ece0b967d):
   - c2139d8c: R5xx Accel: another 2DFlush fix...