[xorg-x11-xfs] xfs 1.1.4 (rhbz#952216)

[Hans de Goede]

commit a2d377c0dc7d364cb3afddea38f33e11596d246c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Aug 28 23:23:14 2014 +0200

    xfs 1.1.4 (rhbz#952216)
    
    - xfsinfo 1.0.4
    - fslsfonts 1.0.4
    - fstobdf 1.0.5
    - showfont 1.0.4

 .gitignore                   |    5 +++++
 sources                      |   10 +++++-----
 xfs-1.1.3-xfont-compat.patch |   21 ---------------------
 xorg-x11-xfs.spec            |   30 +++++++++++++-----------------
 4 files changed, 23 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5ec14e..e7d6c06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,8 @@ xfs-1.1.1.tar.bz2
 xfsinfo-1.0.3.tar.bz2
 /xfs-1.1.2.tar.bz2
 /xfs-1.1.3.tar.bz2
+/fslsfonts-1.0.4.tar.bz2
+/fstobdf-1.0.5.tar.bz2
+/showfont-1.0.4.tar.bz2
+/xfs-1.1.4.tar.bz2
+/xfsinfo-1.0.4.tar.bz2
diff --git a/sources b/sources
index b5e35d0..c2865aa 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-9b50d967ac6d4bae9bffb62a5e527a50  fslsfonts-1.0.3.tar.bz2
-fc1f42aac16d6b76c79a1a3a0fb6a53b  fstobdf-1.0.4.tar.bz2
-50b466ab6ed4a5b8df5abf1ef844309a  showfont-1.0.3.tar.bz2
-aae6fa48b5c2ce9186a5ff4ccc14a1d4  xfsinfo-1.0.3.tar.bz2
-38a5cb2d9103b91b4497310393a88d6d  xfs-1.1.3.tar.bz2
+3e2d206f500a9615ec65dbb6b1e4b487  fslsfonts-1.0.4.tar.bz2
+c536ac53e51df0a28e764a7cf7ef4924  fstobdf-1.0.5.tar.bz2
+f7be42f846bb9cd951b5cbeb6aa85dde  showfont-1.0.4.tar.bz2
+12adb259ee5e3df9633783e21b7a7a82  xfs-1.1.4.tar.bz2
+76149e6c6d77c5c7252b8fb5b24bcac5  xfsinfo-1.0.4.tar.bz2
diff --git a/xorg-x11-xfs.spec b/xorg-x11-xfs.spec
index 383aada..22b1b0d 100644
--- a/xorg-x11-xfs.spec
+++ b/xorg-x11-xfs.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xfs font server
 Name: xorg-x11-xfs
-Version: 1.1.3
-Release: 2%{?dist}
+Version: 1.1.4
+Release: 1%{?dist}
 # NOTE: Remove Epoch line if package gets renamed
 Epoch: 1
 License: MIT
@@ -9,15 +9,13 @@ Group: System Environment/Daemons
 URL: http://www.x.org
 
 Source0: ftp://ftp.x.org/pub/individual/app/xfs-%{version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xfsinfo-1.0.3.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/fslsfonts-1.0.3.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/fstobdf-1.0.4.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/showfont-1.0.3.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xfsinfo-1.0.4.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/fslsfonts-1.0.4.tar.bz2
+Source3: ftp://ftp.x.org/pub/individual/app/fstobdf-1.0.5.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/showfont-1.0.4.tar.bz2
 Source10:  xfs.init
 Source11:  xfs.config
 
-Patch0: xfs-1.1.3-xfont-compat.patch
-
 BuildRequires: pkgconfig
 # xfs needs 'fontsproto' to build, as indicated by ./configure
 BuildRequires: xorg-x11-proto-devel
@@ -56,7 +54,6 @@ X.Org X11 font server utilities
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-%patch0 -p0
 
 %build
 # Build xfs
@@ -80,7 +77,6 @@ for pkg in xfsinfo fslsfonts fstobdf showfont ; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # Install xfs
 {
    pushd xfs-*
@@ -105,9 +101,6 @@ done
    install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
 }
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %pre
 {
   /usr/sbin/useradd -c "X Font Server" -r -s /sbin/nologin -u 43 -d /etc/X11/fs xfs || :
@@ -159,7 +152,6 @@ rm -rf $RPM_BUILD_ROOT
 }
 
 %files
-%defattr(-,root,root,-)
 %doc xfs-%{version}/COPYING
 %{_bindir}/xfs
 %dir %{_sysconfdir}/X11/fs
@@ -175,20 +167,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/xfs
 
 %files utils
-%defattr(-,root,root,-)
-# cheating
 %doc xfs-%{version}/COPYING
 %{_bindir}/fslsfonts
 %{_bindir}/fstobdf
 %{_bindir}/showfont
 %{_bindir}/xfsinfo
-#%dir %{_mandir}/man1x
 %{_mandir}/man1/fslsfonts.1*
 %{_mandir}/man1/fstobdf.1*
 %{_mandir}/man1/showfont.1*
 %{_mandir}/man1/xfsinfo.1*
 
 %changelog
+* Thu Aug 28 2014 Hans de Goede <hdegoede at redhat.com> - 1:1.1.4-1
+- xfs 1.1.4 (rhbz#952216)
+- xfsinfo 1.0.4
+- fslsfonts 1.0.4
+- fstobdf 1.0.5
+- showfont 1.0.4
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild