[hostname: 2/2] Merge branch 'f18'

[Jiří Popelka]

commit 1ed87e22e1176d8bae0fd764f88b1666181b61b5
Merge: 06d6638 7194b2e
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Mar 8 12:18:00 2013 +0100

    Merge branch 'f18'

 hostname-rh.patch |   16 +++++-----------
 hostname.spec     |   13 +++++--------
 2 files changed, 10 insertions(+), 19 deletions(-)
---
diff --cc hostname.spec
index e96e663,22eae2f..756a967
--- a/hostname.spec
+++ b/hostname.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Utility to set/show the host name or domain name
  Name: hostname
  Version: 3.12
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  URL: http://packages.qa.debian.org/h/hostname.html
@@@ -36,9 -30,9 +30,12 @@@ make BASEDIR=%{buildroot} instal
  %{_mandir}/man1/*
  
  %changelog
 -* Fri Mar 08 2013 Jiri Popelka <jpopelka at redhat.com> - 3.12-2
++* Fri Mar 08 2013 Jiri Popelka <jpopelka at redhat.com> - 3.12-3
+ - do not ship outdated french man pages (#919198)
+ 
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Fri Dec 07 2012  Jiri Popelka <jpopelka at redhat.com> - 3.12-1
  - 3.12: man page improvements