Hello community, here is the log from the commit of package R-base for openSUSE:Factory checked in at 2019-02-01 11:46:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/R-base (Old) and /work/SRC/openSUSE:Factory/.R-base.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "R-base" Fri Feb 1 11:46:52 2019 rev:64 rq:670208 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/R-base/R-base.changes 2018-12-21 08:22:31.621507751 +0100 +++ /work/SRC/openSUSE:Factory/.R-base.new.28833/R-base.changes 2019-02-01 11:46:54.728462106 +0100 @@ -1,0 +2,8 @@ +Tue Jan 15 20:46:55 UTC 2019 - Todd R <[email protected]> + +- Add architecture-independent package directory. + Taken from the Fedora version of R. +- Add RPM macros to ease installation of R packages. +- Fix building on older versions of openSUSE. + +------------------------------------------------------------------- New: ---- macros.R ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ R-base.spec ++++++ --- /var/tmp/diff_new_pack.2CqayO/_old 2019-02-01 11:46:55.708461100 +0100 +++ /var/tmp/diff_new_pack.2CqayO/_new 2019-02-01 11:46:55.712461095 +0100 @@ -1,7 +1,7 @@ # # spec file for package R-base # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -16,13 +16,21 @@ # +%if 0%{?sle_version} < 150000 +%define macrosdir %{_sysconfdir}/rpm/ +%else +%define macrosdir %{_rpmconfigdir}/macros.d/ +%endif + + %define release 1 Name: R-base Version: 3.5.2 Release: %release %define Rversion %{version} -Source: R-%{version}.tar.bz2 +Source0: R-%{version}.tar.bz2 +Source10: macros.R #Source: http://cran.r-project.org/src/base/R-2/R-%%{version}.tar.gz # PATCH-FIX-UPSTREAM Fix tre when wchar_t is unsigned int #Patch0: tre.patch @@ -54,13 +62,6 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) -%if %suse_version < 1230 -# nowadays means == 1220 -BuildRequires: texlive-bin -BuildRequires: texlive-bin-latex -BuildRequires: texlive-fonts-extra -%else -# else for < 1230, therefore >=1230 BuildRequires: texlive-bibtex BuildRequires: texlive-cm-super BuildRequires: texlive-dvips @@ -74,18 +75,13 @@ BuildRequires: xdg-utils BuildRequires: xz-devel BuildRequires: zip - -# No tex(inconsolata.sty) provided in SLE-12, same for 42.1 - %if %suse_version != 1315 -BuildRequires: tex(inconsolata.sty) - %endif # !=1315 -%endif # > 1230 BuildRequires: pango-devel BuildRequires: tcl-devel BuildRequires: texlive-latex -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 +BuildRequires: tex(inconsolata.sty) BuildRequires: texinfo >= 5.1 -%endif # !=1315 +%endif # > 1320 BuildRequires: tk-devel Requires: R-base-devel = %{version} Requires: R-core = %{version} @@ -113,7 +109,6 @@ %prep - %setup -n R-%{version} #%patch0 -p1 @@ -125,7 +120,7 @@ make %{?_smp_mflags} #make make pdf -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 make info # Convert to UTF-8 for i in doc/manual/R-intro.info doc/manual/R-FAQ.info doc/FAQ doc/manual/R-admin.info doc/manual/R-exts.info-1; do @@ -140,7 +135,7 @@ # Installation of Info-files %{__install} -m 755 -d %{_infodir} -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 make DESTDIR=%{buildroot} INFODIR=%{buildroot}%{_infodir} install-info %{__rm} -f %{buildroot}%{_infodir}/dir %{__rm} -f %{buildroot}%{_infodir}/dir.old @@ -150,9 +145,7 @@ chmod -x %{buildroot}%{_libdir}/R/library/mgcv/CITATION -#%if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT -#%endif # Install ld.so.conf.d file to ensure other applications access the shared lib mkdir -p %{buildroot}/etc/ld.so.conf.d @@ -160,6 +153,14 @@ %{_libdir}/R/lib EOF +# Install RPM macros +mkdir -p %{buildroot}%{macrosdir} +install -m 644 -t %{buildroot}%{macrosdir} %{SOURCE10} +sed -i 's|@vers@|%{Rversion}|' %{buildroot}%{macrosdir}/macros.R + +# Add noarch R library directory +mkdir -p %{buildroot}%{_datadir}/R/library + %files -n R-base %package -n R-base-devel @@ -201,6 +202,8 @@ %{_libdir}/R/library/base/Meta/ %{_libdir}/R/library/base/R/ +# noarch + # translations %doc %{_libdir}/R/library/translations/DESCRIPTION %dir %{_libdir}/R/library/translations/ @@ -307,6 +310,7 @@ # R-core main part %dir %{_libdir}/R +%dir %{_datadir}/R %{_bindir}/* %{_libdir}/R/bin/ %{_libdir}/R/etc/ @@ -314,6 +318,7 @@ %{_libdir}/R/modules/ %dir %{_libdir}/R/share %dir %{_libdir}/R/library +%dir %{_datadir}/R/library/ %{_libdir}/R/share/encodings/ %{_libdir}/R/share/java/ @@ -336,6 +341,7 @@ Summary: Libraries and includefiles for developing with R-base Group: Development/Libraries/Other Provides: R-devel = %{version} +Provides: R-devel-macros = %{version} Requires: R-base %description -n R-core-devel @@ -391,6 +397,7 @@ %{_libdir}/R/include/R_ext/stats_package.h %{_libdir}/R/include/R_ext/stats_stubs.h +%{macrosdir}/macros.R %{_libdir}/pkgconfig/libR.pc #R-core-libs @@ -422,7 +429,7 @@ This packages provides all documentation of R base. PDFs, man pages, info pages %post -n R-core-doc -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 %install_info --info-dir=%{_infodir} %{_infodir}/R-exts.info-1.gz %install_info --info-dir=%{_infodir} %{_infodir}/R-FAQ.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/R-lang.info.gz @@ -435,7 +442,7 @@ %endif %preun -n R-core-doc -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 %install_info_delete --info-dir=%{_infodir} %{_infodir}/R-exts.info-1.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/R-FAQ.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/R-lang.info.gz @@ -454,7 +461,7 @@ %{_mandir}/man1/Rscript.1* %doc %{_libdir}/R/COPYING %doc %{_libdir}/R/SVN-REVISION -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} > 1320 %{_infodir}/*.gz %endif %doc %{_libdir}/R/doc/ ++++++ macros.R ++++++ # R-related variables %R_archlib %{_libdir}/R/library %R_noarchlib %{_datadir}/R/library %R_version @vers@ # Get a version number that is compatible with RPM # Provide the package version as the argument. # Only needed if there are dashes or underscores # in the version number. %R_rpmver() %( echo %1 | tr - . | tr _ . ) # Setup th build directory the right way. # By default %{packname} is used. # Override this with "-p [name]". %R_unpack(p:) %setup -q -c -n %{-p:%{-p*}}%{!-p:%{packname}} # Install the package # By default %{packname} is used. # Override this with "-p [name]". # By default, the package is stored in the architecture-dependent # R library directory. Use the "-n" flag to install in the # architecture-independent directory. # Manually specify a directory using "-t [path]". %R_install(np:t:) \ %define curpack %{-p:%{-p*}}%{!-p:%{packname}} \ %define curlib %{-t:%{-n:%{error:Can't specify both -t and -n}}%{!-n:%{-t*}}}%{!-t:%{-n:%{R_noarchlib}}%{!-n:%{R_archlib}}} \ mkdir -p %{buildroot}%{curlib} \ %{_bindir}/R CMD INSTALL -l %{buildroot}%{curlib} %{curpack} \ test -d %{curpack}/src && (cd %{curpack}/src; rm -f *.o *.so) \ rm -f %{buildroot}%{curlib}/R.css \ %{nil} # Run standard R tests. # By default %{packname} is used. # Override this with "-p [name]". %R_test(p:) %{_bindir}/R CMD check %{-p:%{-p*}}%{!-p:%{packname}}
