X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=chkconfig.spec;h=f92f6850d61c615a20806f7f38b39ce18f617ac0;hb=HEAD;hp=5f2ff3720f7a7e3bbcc58f6a27f2a1cf2f63726f;hpb=bee43504f9120c17ac06f5d526eeca8273d6609a;p=packages%2Fchkconfig.git

diff --git a/chkconfig.spec b/chkconfig.spec
index 5f2ff37..af7821b 100644
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -9,26 +9,26 @@ Summary(ru.UTF-8):	Системная утилита для управления
 Summary(tr.UTF-8):	Sistem servis bilgilerini sorgular ve yeniler
 Summary(uk.UTF-8):	Системна утиліта для керування ієрархією /etc/rc.d
 Name:		chkconfig
-Version:	1.5
-Release:	1
+Version:	1.25
+Release:	2
 Epoch:		2
 License:	GPL v2
 Group:		Applications/System
-Source0:	https://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
-# Source0-md5:	0e59a43ef588a7bba5528b10bb59bef2
+#Source0Download: https://github.com/fedora-sysv/chkconfig/releases
+Source0:	https://github.com/fedora-sysv/chkconfig/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	12a7b241ba7d3730b9dc389115be50ee
 Patch0:		%{name}-add.patch
 Patch1:		%{name}-noxinet.patch
 Patch2:		%{name}-rc.d.patch
 Patch3:		%{name}-optflags.patch
 Patch4:		%{name}-pl.patch
-URL:		https://git.fedorahosted.org/git/chkconfig.git
+Patch5:		%{name}-split-usr.patch
+URL:		https://github.com/fedora-sysv/chkconfig
 BuildRequires:	gettext-tools
 BuildRequires:	libselinux-devel
 BuildRequires:	newt-devel
 BuildRequires:	popt-devel
 Requires:	rc-scripts
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -160,13 +160,14 @@ Perla; ma być zamiennikiem skryptu update-alternatives z Debiana.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
 	OPTFLAGS="%{rpmcppflags} %{rpmcflags}" \
 	OPTLDFLAGS="%{rpmldflags}" \
-	SYSTEMDDIR=/lib/systemd
+	SYSTEMDUTILDIR=/lib/systemd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -174,7 +175,7 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/{init,rc{0,1,2,3,4,5,6}}.d,env.d},/sbin}
 
 %{__make} install \
 	MANDIR=%{_mandir} \
-	SYSTEMDDIR=/lib/systemd \
+	SYSTEMDUTILDIR=/lib/systemd \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/bal