commit 65ebc6b2f6138daf653554b4e42d6f4e0289f8ad
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 7 20:10:01 2013 +0100
- updated to 3.15; outdated fr man page has been dropped
- updated rh patch
hostname-rh.patch | 39 ++++++++++++++++-----------------------
hostname.spec | 7 ++-----
2 files changed, 18 insertions(+), 28 deletions(-)
---
diff --git a/hostname.spec b/hostname.spec
index e97fd1a..7f6ac82 100644
--- a/hostname.spec
+++ b/hostname.spec
@@ -1,12 +1,12 @@
Summary: Utility to set/show the host name or domain name
Summary(pl.UTF-8): Narzędzie do ustawiania i sprawdzania nazwy hosta lub
domeny
Name: hostname
-Version: 3.14
+Version: 3.15
Release: 1
License: GPL v2+
Group: Base
Source0:
ftp://ftp.debian.org/debian/pool/main/h/hostname/%{name}_%{version}.tar.gz
-# Source0-md5: 4674720aeed0326a53ca397a664f69c4
+# Source0-md5: f93c87de2517850de5f47234e3bcb563
Patch1: %{name}-rh.patch
URL: http://packages.qa.debian.org/h/hostname.html
BuildRequires: iconv
@@ -26,8 +26,6 @@ systemu oraz ustawiania nazwy hosta lub domeny NIS.
%setup -q -n %{name}
%patch1 -p1
-iconv -f iso-8859-1 -t utf-8 -o hostname.tmp hostname.1.fr && mv hostname.tmp
hostname.1.fr
-
%build
%{__make} \
CC="%{__cc}" \
@@ -56,4 +54,3 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/hostname.1*
%{_mandir}/man1/nisdomainname.1*
%{_mandir}/man1/ypdomainname.1*
-%lang(fr) %{_mandir}/fr/man1/*.1*
diff --git a/hostname-rh.patch b/hostname-rh.patch
index 90ae5ab..56cbd13 100644
--- a/hostname-rh.patch
+++ b/hostname-rh.patch
@@ -65,9 +65,9 @@
Historically this file was supposed to only contain the hostname and not the
full canonical FQDN. Nowadays most software is able to cope with a full FQDN
here. This file is read at boot time by the system initialization scripts to
---- hostname/Makefile.orig 2013-09-14 07:43:56.738832590 +0200
-+++ hostname/Makefile 2013-09-14 07:52:31.232144332 +0200
-@@ -7,22 +7,23 @@
+--- hostname/Makefile.orig 2013-11-07 19:16:18.797171655 +0100
++++ hostname/Makefile 2013-11-07 19:22:08.767156968 +0100
+@@ -10,21 +10,17 @@
hostname: $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl
@@ -77,24 +77,17 @@
- ln -fs hostname nisdomainname
install: hostname
- install -d ${BASEDIR}/usr/share/man/man1
-- install -o root -g root -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
-+ install -m 0644 hostname.1 ${BASEDIR}/usr/share/man/man1
- ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/dnsdomainname.1
- ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/domainname.1
- ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/ypdomainname.1
- ln -fs hostname.1 ${BASEDIR}/usr/share/man/man1/nisdomainname.1
-- #install -o root -g root -m 0644 hostname.1.fr
${BASEDIR}/usr/share/man/fr/man1/hostname.1
-+ install -d ${BASEDIR}/usr/share/man/fr/man1
-+ install -m 0644 hostname.1.fr
${BASEDIR}/usr/share/man/fr/man1/hostname.1
-+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/dnsdomainname.1
-+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/domainname.1
-+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/ypdomainname.1
-+ ln -fs hostname.1 ${BASEDIR}/usr/share/man/fr/man1/nisdomainname.1
+ install -d ${BASEDIR}$(MANDIR)/man1
+- install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
++ install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
+ ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1
+ ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1
+ ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1
+ ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1
- install -d ${BASEDIR}/bin
-- install -o root -g root -m 0755 hostname ${BASEDIR}/bin
-+ install -m 0755 hostname ${BASEDIR}/bin
- ln -fs hostname ${BASEDIR}/bin/dnsdomainname
- ln -fs hostname ${BASEDIR}/bin/domainname
- ln -fs hostname ${BASEDIR}/bin/nisdomainname
+ install -d ${BASEDIR}$(BINDIR)
+- install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR)
++ install -m 0755 hostname ${BASEDIR}$(BINDIR)
+ ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname
+ ln -fs hostname ${BASEDIR}$(BINDIR)/domainname
+ ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hostname.git/commitdiff/65ebc6b2f6138daf653554b4e42d6f4e0289f8ad
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
