- repaired https://bugzilla.suse.com/show_bug.cgi?id=1191380

(rpmacros now go to rpmmacrodir)
- minor clean-ups in spec file

OBS-URL: https://build.opensuse.org/package/show/devel:languages:R:released/R-base?expand=0&rev=119

R-base.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 25 14:09:08 UTC 2021 - Detlef Steuer <detlef.steuer@gmx.de>
+
+- repaired https://bugzilla.suse.com/show_bug.cgi?id=1191380
+  (rpmacros now go to rpmmacrodir)
+- minor clean-ups in spec file
+
 -------------------------------------------------------------------
 Tue Aug 10 12:23:48 UTC 2021 - Detlef Steuer <detlef.steuer@gmx.de>
 

R-base.spec

@@ -16,10 +16,8 @@
 #
 
 
-%if 0%{?sle_version} < 150000
+%if %{undefined _rpmmacrodir}
-%define macrosdir %{_sysconfdir}/rpm/
+%define _rpmmacrodir %{_sysconfdir}/rpm/
-%else
-%define macrosdir %{_rpmconfigdir}/macros.d/
 %endif
 
 %define release 1
@@ -134,7 +132,6 @@ make DESTDIR=%{buildroot} install
 make DESTDIR=%{buildroot} install-pdf
 
 # Installation of Info-files
-#%{__install} -m 755 -d %{_infodir}
 %if 0%{?suse_version} > 1320
 make DESTDIR=%{buildroot} INFODIR=%{buildroot}%{_infodir} install-info
 %{__rm} -f %{buildroot}%{_infodir}/dir
@@ -154,9 +151,9 @@ cat << EOF >%{buildroot}/etc/ld.so.conf.d/R.conf
 EOF
 
 # Install RPM macros
-mkdir -p %{buildroot}%{macrosdir}
+mkdir -p %{buildroot}%{_rpmmacrodir}
-install -m 644 -t %{buildroot}%{macrosdir} %{SOURCE10}
+install -m 644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE10}
-sed -i 's|@vers@|%{Rversion}|' %{buildroot}%{macrosdir}/macros.R
+sed -i 's|@vers@|%{Rversion}|' %{buildroot}%{_rpmmacrodir}/macros.R
 
 # Add noarch R library directory
 mkdir -p %{buildroot}%{_datadir}/R/library
@@ -397,7 +394,7 @@ libraries to allow you to devel with R-base.
 %{_libdir}/R/include/R_ext/stats_package.h
 %{_libdir}/R/include/R_ext/stats_stubs.h
 
-%{macrosdir}/macros.R
+%config %{_rpmmacrodir}/macros.R
 %{_libdir}/pkgconfig/libR.pc
 
 #R-core-libs
@@ -1383,9 +1380,9 @@ Summary:        Package provides recommended R-Matrix
 Version:        1.3.4
 Release:        %release
 Requires:       R-base
-Obsoletes:      R-Matrix-devel < 1.3.4
+Obsoletes:      R-Matrix-devel <= 1.3.2
 Provides:       R-Matrix-devel
-# This is for backwards-compatibility only. Nothind *should*
+# This is for backwards-compatibility only. Nothing *should*
 # (Build)Require R-Matrix-devel
 
 %description -n R-Matrix
@@ -1426,24 +1423,6 @@ This packages provides R-Matrix, one of the recommended packages.
 %{_libdir}/R/library/Matrix/include/Matrix_stubs.c
 %{_libdir}/R/library/Matrix/include/cholmod.h
 
-#%package -n R-Matrix-devel
-#Summary:        Package provides header files for recommended R-Matrix
-#Version:        1.3.2
-#Release:        %release
-#Requires:       R-Matrix
-#Requires:       R-base
-#
-#%description -n R-Matrix-devel
-#Package provides header files for recommended R-Matrix
-#
-#%files -n R-Matrix-devel
-#%defattr(-, root, root)
-#
-#%dir %{_libdir}/R/library/Matrix/include/
-#%{_libdir}/R/library/Matrix/include/Matrix.h
-#%{_libdir}/R/library/Matrix/include/Matrix_stubs.c
-#%{_libdir}/R/library/Matrix/include/cholmod.h
-
 %package -n R-mgcv
 Summary:        Package provides recommended R-mgcv
 Version:        1.8.36