libXxf86dga 1.1.4

Merge branch 'master' into f19
Conflicts: libXxf86dga.spec
2013-06-04 14:09:08 +10:00 · 2013-05-28 09:49:15 +10:00 · 2013-05-24 16:14:33 +10:00
3 changed files with 8 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@ libXxf86dga-1.1.1.tar.bz2
 /libXxf86dga-1.1.2.tar.bz2
 /libXxf86dga-1.1.3.tar.bz2
 /libXxf86dga-20130524.tar.bz2
+/libXxf86dga-1.1.4.tar.bz2
--- a/libXxf86dga.spec
+++ b/libXxf86dga.spec
@ -1,11 +1,11 @@
 %global tarball libXxf86dga
-%global gitdate 20130524
+#global gitdate 20130524
 %global gitversion a8dc6be32

 Summary: X.Org X11 libXxf86dga runtime library
 Name: libXxf86dga
-Version: 1.1.3
-Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version: 1.1.4
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/Xxf86dga.h

 %changelog
+* Tue Jun 04 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.1.4-1
+- libXxf86dga 1.1.4
+
 * Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.3-6.20130524gita8dc6be32
 - Require libX11 1.6RC2 for _XEatDataWords

--- a/2
+++ b/2
@ -1 +1 @@
-9d8064b1e472f89869a4cdee9b271510  libXxf86dga-20130524.tar.bz2
+d7dd9b9df336b7dd4028b6b56542ff2c  libXxf86dga-1.1.4.tar.bz2
Author	SHA1	Message	Date
Peter Hutterer	4e16eee95c	libXxf86dga 1.1.4	2013-06-04 14:09:08 +10:00
Peter Hutterer	a93a6fb0c4	Merge branch 'master' into f19 Conflicts: libXxf86dga.spec	2013-05-28 09:49:15 +10:00
Dave Airlie	ffb5259d5f	update to latest git for security fixes (CVE-2013-1991)	2013-05-24 16:14:33 +10:00