Accepting request 290074 from home:pluskalm:branches:devel:languages:misc

- Cleanup spec file with spec-cleaner
- Add gpg signature

OBS-URL: https://build.opensuse.org/request/show/290074
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=74

guile.spec

@@ -24,15 +24,7 @@
 %define gsuff       %{guilemaj}_%{guilemin}-%{libgver}
 %define libgreadver 18
 %define greadsuff   v-%{libgreadver}-%{libgreadver}
-
 Name:           guile
-BuildRequires:  gc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  libffi-devel
-BuildRequires:  libltdl-devel
-BuildRequires:  libunistring-devel
-BuildRequires:  pkg-config
-BuildRequires:  readline-devel
 Version:        %{guilevers}.11
 Release:        0
 Summary:        GNU's Ubiquitous Intelligent Language for Extension
@@ -40,17 +32,27 @@ License:        GFDL-1.3 and GPL-3.0+ and LGPL-3.0+
 Group:          Development/Languages/Scheme
 Url:            http://www.gnu.org/software/guile/
 Source0:        ftp://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.gz
-Source1:        guile-rpmlintrc
+Source1:        ftp://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.gz.sig
+Source2:        %{name}.keyring
+Source3:        guile-rpmlintrc
 # suse specific
 Patch0:         %{name}-fake-buildstamp.patch
 Patch1:         %{name}-64bit.patch
 Patch2:         %{name}-1.6.10-mktemp.patch
 Patch3:         %{name}-threads-test.patch
 Patch4:         %{name}-net-db-test.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         fileutils sh-utils
-PreReq:         %install_info_prereq
+BuildRequires:  gc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  libffi-devel
+BuildRequires:  libltdl-devel
+BuildRequires:  libunistring-devel
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel
+Requires(pre):  %{install_info_prereq}
+Requires(pre):  fileutils
+Requires(pre):  sh-utils
 Conflicts:      slib < 3a5
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -97,14 +99,14 @@ License:        LGPL-2.1+
 Group:          Development/Languages/Scheme
 Requires:       gc-devel
 Requires:       gmp-devel
+# following Requires needed because /usr/bin/guile-config needs /usr/bin/guile
+Requires:       guile = %{version}
 Requires:       libffi-devel
+Requires:       libguile-%{gsuff} = %{version}
+Requires:       libguilereadline-%{greadsuff} = %{version}
 Requires:       libunistring-devel
 Requires:       ncurses-devel
 Requires:       readline-devel
-# following Requires needed because /usr/bin/guile-config needs /usr/bin/guile
-Requires:       guile = %{version}
-Requires:       libguile-%{gsuff} = %{version}
-Requires:       libguilereadline-%{greadsuff} = %{version}
 
 %description devel
 This is Guile, a portable, embeddable Scheme implementation written in
@@ -127,15 +129,15 @@ linked in as a library when building extensible programs.
 
 %configure --disable-static --with-pic \
 	--with-threads --disable-silent-rules
-make
+make %{?_smp_mflags}
 
 %check
 LD_LIBRARY_PATH="." make check
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/guile/site
-find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+mkdir -p %{buildroot}%{_datadir}/guile/site
+find %{buildroot} -type f -name "*.la" -delete -print
 # bug #874028
 mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}
 mv %{buildroot}%{_libdir}/libguile*-gdb.scm %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}/
@@ -150,7 +152,7 @@ mv %{buildroot}%{_libdir}/libguile*-gdb.scm %{buildroot}%{_datadir}/gdb/auto-loa
 
 %pre
 # Remove obsolete files (< SuSE Linux 10.2)
-rm -f var/adm/SuSEconfig/md5/usr/share/guile/*/slibcat
+rm -f var/adm/SuSEconfig/md5%{_datadir}/guile/*/slibcat
 rm -f usr/share/guile/site/slibcat.SuSEconfig
 
 %post -n libguile-%{gsuff} -p /sbin/ldconfig
@@ -180,7 +182,7 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig
 # Own usr/share/guile/site; side effect of not doing so is slib failing to install correctly.
 %{_datadir}/%{name}
 
-%files  -n libguilereadline-%{greadsuff}
+%files -n libguilereadline-%{greadsuff}
 %defattr(-,root,root)
 # please leave .so file here [bnc#765436]
 %{_libdir}/libguilereadline-v-%{libgreadver}.so