rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Jan 13 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-1

Browse Source 
- xserver 1.6 RC 1
- fix "git-xyz" to "git xyz"
- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.
This commit is contained in:
Peter Hutterer 2009-01-12 23:21:24 +00:00
parent 66e1b5f9d0
commit 714b488bfc
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xorg-server-20090112.tar.bz2 xorg-server-1.5.99.901.tar.bz2

2
make-git-snapshot.sh
View File

@ -8,7 +8,7 @@ cd $DIRNAME
if [ -z "$1" ]; then if [ -z "$1" ]; then
git log | head -1 git log | head -1
else else
git checkout -b $1 origin/$1 git checkout $1
fi fi
git log | head -1 | awk '{ print $2 }' > ../commitid git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d git repack -a -d

2
sources
View File

@ -1 +1 @@
c3b4a1c33dae3aba6fd544c73bd4f6dc xorg-server-20090112.tar.bz2 905970280ee831ddbde1aa7bef352ada xorg-server-1.5.99.901.tar.bz2

25
xorg-x11-server.spec
View File

@ -14,12 +14,12 @@
# Fix rhpxl to no longer need vesamodes/extramodes # Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server %define pkgname xorg-server
%define gitdate 20090112 #define gitdate 20090112
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.5.99.3 Version: 1.5.99.901
Release: 9%{?dist} Release: 1%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -73,8 +73,6 @@ Patch5011: xserver-1.4.99-endian.patch
Patch6002: xserver-1.5.1-mode-debug.patch Patch6002: xserver-1.5.1-mode-debug.patch
Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
# 6005 should be in 1.5.99.4
Patch6005: xserver-1.5.99.3-ddx-rules.patch
# hack around broken mtrr.h. drop me as soon as possible. # hack around broken mtrr.h. drop me as soon as possible.
Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch Patch6007: xserver-1.5.99.3-broken-mtrr-header.patch
@ -274,18 +272,18 @@ Xserver source code needed to build VNC server (Xvnc)
git checkout -b fedora git checkout -b fedora
sed -i 's/git/&+ssh/' .git/config sed -i 's/git/&+ssh/' .git/config
%else %else
git-init-db git init-db
if [ -z "$GIT_COMMITTER_NAME" ]; then if [ -z "$GIT_COMMITTER_NAME" ]; then
git-config user.email "x@fedoraproject.org" git config user.email "x@fedoraproject.org"
git-config user.name "Fedora X Ninjas" git config user.name "Fedora X Ninjas"
fi fi
cp %{SOURCE1} .gitignore cp %{SOURCE1} .gitignore
git-add . git add .
git-commit -a -q -m "%{version} baseline." git commit -a -q -m "%{version} baseline."
%endif %endif
# Apply all the patches. # Apply all the patches.
#git-am -p1 %{patches} #git am -p1 %{patches}
git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
%build %build
@ -494,6 +492,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jan 13 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.901-1
- xserver 1.6 RC 1
- fix "git-xyz" to "git xyz"
- revert yesterdays changes to make-git-snapshot.sh, that was a bad idea.
* Mon Jan 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-5 * Mon Jan 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-5
- rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave - rebase to today's server-1.6-enterleave branch, current 1.6 plus enterleave
patches. patches.