Remove obsolete patches

Rebase onto 2.7.0
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1796030
This commit is contained in:
Filip Januš 2020-01-29 14:47:43 +01:00
parent 472d9004fe
commit 13ff3cd359
5 changed files with 8 additions and 36 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ ypbind-mt-1.32.tar.bz2
/ypbind-mt-2.4.tar.gz
/ypbind-mt-2.5.tar.gz
/ypbind-mt-2.6.1.tar.gz
/ypbind-mt-2.7.0.tar.gz

View File

@ -1 +1 @@
SHA512 (ypbind-mt-2.6.1.tar.gz) = 5d5a15bfdcf93683f309c5c6ddabe785bda274474cf8a68d7034ea4ade35f30efeff5aa9c1087945823ff1f28a85eb2965924189cd1c7d9495b437df26b79b8c
SHA512 (ypbind-mt-2.7.0.tar.gz) = 424d154ccde9899896331f64b70f2504116afe5862487c570df19b0601f8002ef5638f7fe88a8bb2ab91d012a1bb9c7dcf6f4fc30aacb98aef44bc2b6031dd42

View File

@ -1,10 +0,0 @@
--- configure.ac.gettext_version 2016-03-02 15:10:26.000000000 +0100
+++ configure.ac 2017-02-15 13:39:12.295019148 +0100
@@ -59,7 +60,6 @@ JH_CHECK_XML_CATALOG([http://docbook.sou
AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
dnl internationalization macros
-AM_GNU_GETTEXT_VERSION
AM_GNU_GETTEXT([external])
AC_OUTPUT(Makefile lib/Makefile src/Makefile man/Makefile po/Makefile.in)

View File

@ -1,20 +0,0 @@
diff -Naur ypbind-mt-1.38.orig/configure.ac ypbind-mt-1.38/configure.ac
--- ypbind-mt-1.38.orig/configure.ac 2014-10-20 12:20:33.000000000 +0200
+++ ypbind-mt-1.38/configure.ac 2016-11-23 18:15:58.473713436 +0100
@@ -44,6 +44,7 @@
AC_CHECK_LIB(socket, bind)
AC_CHECK_LIB(pthread, pthread_create)
+AC_CHECK_HEADERS([systemd/sd-daemon.h])
PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0])
AC_SUBST(USE_SD_NOTIFY)
@@ -105,7 +106,7 @@
AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno)
dnl internationalization macros
-AM_GNU_GETTEXT_VERSION
+AM_GNU_GETTEXT_VERSION(0.19)
AM_GNU_GETTEXT([external])
dnl By default, don't send a ping to all server at the same time

View File

@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain
Name: ypbind
Epoch: 3
Version: 2.6.1
Version: 2.7.0
Release: 1%{?dist}
License: GPLv2
Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz
@ -16,8 +16,6 @@ Source5: ypbind-post-waitbind
Patch1: ypbind-1.11-gettextdomain.patch
# Not sent to upstream.
Patch2: ypbind-2.5-helpman.patch
Patch3: ypbind-systemdso.patch
Patch4: ypbind-2.4-gettext_version.patch
# This is for /bin/systemctl
Requires(post): systemd
Requires(preun): systemd
@ -57,8 +55,6 @@ also need to install the ypserv package to a machine on your network.
%setup -q -n ypbind-mt-%{version}
%patch1 -p1 -b .gettextdomain
%patch2 -p1 -b .helpman
#%patch3 -p1 -b .systemdso
%patch4 -b .gettext_version
autoreconf -fiv
@ -112,6 +108,11 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
%license COPYING
%changelog
* Wed Jan 29 2020 Filip Januš <fjanus@redhat.com> - 3:2.7.0-1
- Upstream released new version
- Remove obsolete patches
- Resolves: #1796030
* Tue Jul 30 2019 Matej Mužila <mmuzila@redhat.com> - 3:2.6.1-1
- Update to version 2.6.1
- Resolves: #1668439