Accepting request 294478 from devel:tools

1

OBS-URL: https://build.opensuse.org/request/show/294478
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/idutils?expand=0&rev=17

idutils-4.6.tar.xz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABCAAGBQJPK9kTAAoJEH/Z/MsAC+7uFFQP/3Ar1YGCMSQYaWA2jmkMcVEC
+UtytyoYXwiRaAoBqXuUtC+uf72E/juLOP/yUvPgXxRb/8HBmsIjncXs90FtLJv32
+Nb/OLc6J7KveffOcWQUot4vIA3YGlFvmJSPHLcunBd3cuzSMBxxNRP0tGk21dABW
+Ih103XhwkwvP9kQVEYUeK0pF8dV1GZtORE0pvpggu0hRTmc252PfE0pfxSOQ8ica
+R03S72Gn/fSeTWv/bPT6lb4EIUlB5pqDry2batkBoCgZW49CbNukkfQb2L32Vc/F
+2HIguxWU1oTzCTE12DTRD75cut0usrzaPElgtZo3R3/LKg1+nF+xfxkCQjW1t++W
+OXo/uhP02iTgnQz4d72+3PQSgosI92gkwV79pefo55cuZQYS8aRNryi8/M67M15a
+YwBOFcehMm9qZL7tIdF+AidbAdvorXb/aLqSxR0FgmtYj8iTxvYUuYhb2kK26ie1
+YxItrXJuaHioo+6hNJy4bl9YPCBZn0S0HBc1sUuE3pRYC9g3r+iWY576dMuUVrhP
+apo+ax4wliRtVbIBEK7kbjunQPz0OipTHmBr6LcYGH4dGQ7+cExRGnwi0cwE7V4V
+A/YrdHZoAseQgdE3ObgdLRzN6A9832wpwL55kkxR7xs+fWhUEoNKl5UOLdCxlJcx
+URvzuIyPHmBsKaoR9VF5
+=fXMp
+-----END PGP SIGNATURE-----

idutils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  2 17:51:04 UTC 2015 - mpluskal@suse.com
+
+- Add gpg signature
+- Update dependencies
+
 -------------------------------------------------------------------
 Sun Mar  1 17:32:19 UTC 2015 - p.drouand@gmail.com
 

idutils.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package idutils
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,23 @@
 
 
 Name:           idutils
+Version:        4.6
+Release:        0
 Summary:        Language-Independent Identifier Database Tool
 License:        GPL-2.0+
 Group:          Productivity/Text/Utilities
-Version:        4.6
-Release:        0
 Url:            http://www.gnu.org/software/idutils/
-Source:         ftp://ftp.gnu.org/pub/gnu/idutils/idutils-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        ftp://ftp.gnu.org/pub/gnu/idutils/idutils-%{version}.tar.xz
+Source1:        ftp://ftp.gnu.org/pub/gnu/idutils/idutils-%{version}.tar.xz.sig
+Source2:        %{name}.keyring
 BuildRequires:  emacs-nox
-PreReq:         %{install_info_prereq}
+BuildRequires:  xz
+Requires(preun): %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+Recommends:     %{name}-lang
 Provides:       id-utils
 Obsoletes:      id-utils
-Obsoletes:      id_utils
-Recommends:     %{name}-lang
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Mkid is a simple, fast, high-capacity, and language-independent
@@ -43,7 +46,7 @@ tags facility.
 %lang_package
 
 %prep
-%setup
+%setup -q
 
 %build
 %configure
@@ -52,13 +55,13 @@ sed -i -e '/gets is a security/d' lib/stdio.in.h
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/lib/idutils
-mv $RPM_BUILD_ROOT%{_prefix}/share/id-lang.map $RPM_BUILD_ROOT/var/lib/idutils
-ln -s ../../var/lib/idutils/id-lang.map $RPM_BUILD_ROOT%{_prefix}/share/id-lang.map
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+install -d %{buildroot}%{_localstatedir}/lib/idutils
+mv %{buildroot}%{_datadir}/id-lang.map %{buildroot}%{_localstatedir}/lib/idutils
+ln -s ../..%{_localstatedir}/lib/idutils/id-lang.map %{buildroot}%{_datadir}/id-lang.map
 # Conflict with libuser
 rm -f %{buildroot}%{_mandir}/man1/lid.1
-%find_lang %name
+%find_lang %{name}
 
 %post
 if test -f %{_infodir}/id-utils.info.gz; then
@@ -68,14 +71,14 @@ if test -f %{_infodir}/id-utils.info.gz; then
 fi
 %install_info --info-dir=%{_infodir} %{_infodir}/idutils.info.gz
 
-%postun
+%preun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/idutils.info.gz
 
 %files
 %defattr(-,root,root)
 %doc ABOUT-NLS AUTHORS COPYING NEWS README THANKS TODO
-%config /var/lib/idutils/id-lang.map
-%dir /var/lib/idutils
+%config %{_localstatedir}/lib/idutils/id-lang.map
+%dir %{_localstatedir}/lib/idutils
 %{_datadir}/id-lang.map
 %{_datadir}/emacs/site-lisp/idutils.el
 %{_datadir}/emacs/site-lisp/idutils.elc
@@ -84,5 +87,6 @@ fi
 %{_infodir}/idutils.info*
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog