[hostname] 3.05

[Jiří Popelka]

commit 10eaa3737307dd54fe817771f9d9300e288bd99f
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Nov 16 18:08:31 2010 +0100

    3.05

 .gitignore    |    1 +
 hostname.spec |   12 ++++++------
 sources       |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ad8237..cca037c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hostname_3.04.tar.gz
+/hostname_3.05.tar.gz
diff --git a/hostname.spec b/hostname.spec
index b0f44dd..3fb2c64 100644
--- a/hostname.spec
+++ b/hostname.spec
@@ -1,7 +1,7 @@
 Summary: Utility to set/show the host name or domain name
 Name: hostname
-Version: 3.04
-Release: 2%{?dist}
+Version: 3.05
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://packages.qa.debian.org/h/hostname.html
@@ -12,15 +12,12 @@ Source2: hostname.1.de
 # Initial changes
 Patch1: hostname-rh.patch
 
-#net-tools < 1.60-100 includes hostname
-Conflicts: net-tools < 1.60-100
-
 %description
 This package provides commands which can be used to display the system's
 DNS name, and to display or set its hostname or NIS domain name.
 
 %prep
-%setup -q -n hostname
+%setup -q
 %patch1 -p1 -b .rh
 
 #man pages conversion
@@ -60,6 +57,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 16 2010  Jiri Popelka <jpopelka at redhat.com> - 3.05-1
+- Upgrade to 3.05
+
 * Fri Apr 30 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.04-2
 - Mark localized man pages with %%lang.
 
diff --git a/sources b/sources
index 0116a67..984ef20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-57a638deda1153b93f906816c1cb5b08  hostname_3.04.tar.gz
+28f5bf5c4a494b83ca6f106bd472dcb2  hostname_3.05.tar.gz