rpms/xorg-x11-server/F-9 .cvsignore, 1.49, 1.50 import.log, 1.3, 1.4 sources, 1.43, 1.44 xorg-x11-server.spec, 1.339, 1.340 commitid, 1.21, NONE make-git-snapshot.sh, 1.2, NONE
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Thu Jul 24 14:42:01 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17149/F-9
Modified Files:
.cvsignore import.log sources xorg-x11-server.spec
Removed Files:
commitid make-git-snapshot.sh
Log Message:
1.5RC6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore 2 Jul 2008 17:20:09 -0000 1.49
+++ .cvsignore 24 Jul 2008 14:41:11 -0000 1.50
@@ -1 +1 @@
-xorg-server-20080702.tar.bz2
+xorg-server-1.4.99.906.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 2 Jul 2008 17:20:09 -0000 1.3
+++ import.log 24 Jul 2008 14:41:11 -0000 1.4
@@ -1 +1,2 @@
xorg-x11-server-1_4_99_905-2_20080702_fc9:F-9:xorg-x11-server-1.4.99.905-2.20080702.fc9.src.rpm:1215018868
+xorg-x11-server-1_4_99_906-1_fc9:F-9:xorg-x11-server-1.4.99.906-1.fc9.src.rpm:1216909882
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 2 Jul 2008 17:20:09 -0000 1.43
+++ sources 24 Jul 2008 14:41:11 -0000 1.44
@@ -1 +1 @@
-b19b858731fefbfd88be47d4dcb65a02 xorg-server-20080702.tar.bz2
+d225476fea6721d9f64c3268e47d6c51 xorg-server-1.4.99.906.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- xorg-x11-server.spec 2 Jul 2008 17:20:09 -0000 1.339
+++ xorg-x11-server.spec 24 Jul 2008 14:41:11 -0000 1.340
@@ -14,25 +14,25 @@
# Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server
-%define gitdate 20080702
+#define gitdate 20080723
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.4.99.905
-Release: 2.%{gitdate}%{?dist}
+Version: 1.4.99.906
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{gitdate}
+%if 0%{?gitdate}
# git snapshot. to recreate, run:
# ./make-git-snapshot.sh `cat commitid`
-Source0: xorg-server-%{gitdate}.tar.bz2
+Source0: xorg-server-%{?gitdate}.tar.bz2
Source1: make-git-snapshot.sh
Source2: commitid
%else
-Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0: http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
%endif
# OpenGL compositing manager feature/optimization patches.
@@ -91,8 +91,6 @@
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
BuildRequires: libX11-devel libXext-devel
-# XXX Really? Why would we need this, Xfont should hide it.
-BuildRequires: freetype-devel >= 2.1.9-1
# DMX config utils buildreqs.
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
@@ -240,21 +238,20 @@
%prep
%setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%if 0%{gitdate}
+%if 0%{?gitdate}
# XXX hack
git checkout -b fedora
# make it something you can push to.
sed -i 's/git/&+ssh/' .git/config
%else
git-init-db
-echo "This is incomplete. FIXME."
-exit 1
-%endif
-
if [ -z "$GIT_COMMITTER_NAME" ]; then
- export GIT_COMMITTER_NAME="Fedora X Ninjas"
+ git-config user.email "x at fedoraproject.org"
+ git-config user.name "Fedora X Ninjas"
fi
-
+git-add .
+git-commit -a -q -m "%{version} baseline."
+%endif
# Apply all the patches. Hold your nose...
git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
@@ -278,7 +275,7 @@
--with-xkb-output=%{_localstatedir}/lib/xkb \
--with-rgb-path=%{_datadir}/X11/rgb \
--disable-xorgcfg \
- --disable-record \
+ --disable-record --disable-xtrap \
--enable-install-libxf86config \
--enable-xselinux \
--with-dri-driver-path=%{drimoduledir} \
@@ -376,7 +373,6 @@
%{_libdir}/xorg/modules/extensions/libdri2.so
%{_libdir}/xorg/modules/extensions/libdbe.so
%{_libdir}/xorg/modules/extensions/libextmod.so
-%{_libdir}/xorg/modules/extensions/libxtrap.so
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/fonts
%{_libdir}/xorg/modules/fonts/libfreetype.so
@@ -463,6 +459,9 @@
%changelog
+* Wed Jul 23 2008 Adam Jackson <ajax at redhat.com> 1.4.99.906-1
+- 1.5RC6.
+
* Wed Jul 02 2008 Adam Jackson <ajax at redhat.com> 1.4.99.905-2.20080702
- Today's snapshot.
--- commitid DELETED ---
--- make-git-snapshot.sh DELETED ---
More information about the fedora-extras-commits
mailing list