[packages/hostname] Up to 3.25

[arekm]

commit 058c56834fa255369ee0a4bb55a57ac022e03480
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Mar 27 19:24:48 2025 +0100

    Up to 3.25

 hostname-rh.patch | 33 ++++++++++++++++-----------------
 hostname.spec     | 11 ++++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/hostname.spec b/hostname.spec
index 14a50c0..9e829ec 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.23
+Version:	3.25
 Release:	1
 License:	GPL v2+
 Group:		Base
-Source0:	http://ftp.debian.org/debian/pool/main/h/hostname/%{name}_%{version}.tar.gz
-# Source0-md5:	bf6b089a1f59233b5f329b26ff5e8a4e
+Source0:	http://ftp.debian.org/debian/pool/main/h/hostname/%{name}_%{version}.tar.xz
+# Source0-md5:	a295813ded81b3af22aaa0c9834ffc10
 Patch1:		%{name}-rh.patch
 URL:		http://packages.qa.debian.org/h/hostname.html
 BuildRequires:	iconv
@@ -24,7 +24,7 @@ systemu oraz ustawiania nazwy hosta lub domeny NIS.
 
 %prep
 %setup -q -n %{name}
-%patch1 -p1
+%patch -P1 -p1
 
 %build
 %{__make} \
@@ -36,7 +36,8 @@ systemu oraz ustawiania nazwy hosta lub domeny NIS.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	BASEDIR=$RPM_BUILD_ROOT
+	bindir=/bin \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/hostname-rh.patch b/hostname-rh.patch
index 56b06ac..7fded5b 100644
--- a/hostname-rh.patch
+++ b/hostname-rh.patch
@@ -1,7 +1,7 @@
-diff -urNp -x '*.orig' hostname.org/Makefile hostname/Makefile
---- hostname.org/Makefile	2018-01-30 11:25:42.000000000 +0100
-+++ hostname/Makefile	2021-05-09 20:19:07.910374609 +0200
-@@ -10,21 +10,17 @@ OBJS=hostname.o
+diff -ur hostname.org/Makefile hostname/Makefile
+--- hostname.org/Makefile	2024-07-30 08:23:54.000000000 +0200
++++ hostname/Makefile	2025-03-27 19:22:49.487520045 +0100
+@@ -14,18 +14,14 @@
  
  hostname: $(OBJS)
  	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
@@ -11,20 +11,19 @@ diff -urNp -x '*.orig' hostname.org/Makefile hostname/Makefile
 -	ln -fs hostname nisdomainname
  
  install: hostname
- 	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 $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_DATA) hostname.1 $(DESTDIR)$(mandir)/man1
+-	ln -fs hostname.1 $(DESTDIR)$(mandir)/man1/dnsdomainname.1
+-	ln -fs hostname.1 $(DESTDIR)$(mandir)/man1/domainname.1
+-	ln -fs hostname.1 $(DESTDIR)$(mandir)/man1/ypdomainname.1
+-	ln -fs hostname.1 $(DESTDIR)$(mandir)/man1/nisdomainname.1
++	echo .so hostname.1 > $(DESTDIR)$(mandir)/man1/dnsdomainname.1
++	echo .so hostname.1 > $(DESTDIR)$(mandir)/man1/domainname.1
++	echo .so hostname.1 > $(DESTDIR)$(mandir)/man1/ypdomainname.1
++	echo .so hostname.1 > $(DESTDIR)$(mandir)/man1/nisdomainname.1
  
- 	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
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) hostname $(DESTDIR)$(bindir)
 diff -urNp -x '*.orig' hostname.org/hostname.1 hostname/hostname.1
 --- hostname.org/hostname.1	2018-09-27 10:41:06.000000000 +0200
 +++ hostname/hostname.1	2021-05-09 20:19:07.910374609 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hostname.git/commitdiff/058c56834fa255369ee0a4bb55a57ac022e03480