Hello community, here is the log from the commit of package nodejs-packaging for openSUSE:Factory checked in at 2015-02-16 21:14:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nodejs-packaging (Old) and /work/SRC/openSUSE:Factory/.nodejs-packaging.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-packaging" Changes: -------- --- /work/SRC/openSUSE:Factory/nodejs-packaging/nodejs-packaging.changes 2014-10-24 10:47:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nodejs-packaging.new/nodejs-packaging.changes 2015-02-16 21:14:25.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Jan 28 16:41:37 UTC 2015 - ma...@detebe.org + +- changed name of rpm macro file in order to prevent conflict with + rpm macro from some versions of nodejs package with same filename +- added macro definitions from nodejs package to this rpm macro file + because they are missing in some versions of nodejs package +- added patch: nodejs-packaging-pre1320-macros.patch + +------------------------------------------------------------------- New: ---- nodejs-packaging-pre1320-macros.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nodejs-packaging.spec ++++++ --- /var/tmp/diff_new_pack.U3KCXA/_old 2015-02-16 21:14:26.000000000 +0100 +++ /var/tmp/diff_new_pack.U3KCXA/_new 2015-02-16 21:14:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nodejs-packaging # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,7 +16,6 @@ # - Name: nodejs-packaging Version: 1 Release: 0 @@ -26,6 +25,7 @@ Url: http://www.nodejs.org Source0: nodejs-packaging.tar.xz Source1: nodejs-packaging-pre1320.tar.bz2 +Patch0: nodejs-packaging-pre1320-macros.patch BuildArch: noarch Requires: nodejs Requires: python @@ -41,13 +41,14 @@ %define _rpmconfigdir %{_prefix}/lib/rpm %setup -q -T -b 1 -n %{name} %endif +%patch0 %build %install mkdir -p %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_rpmconfigdir} mkdir -p %{buildroot}%{_datadir}/node -install -m0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs +install -m0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.%{name} %if 0%{?suse_version} >= 1320 mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs install -m0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr @@ -60,7 +61,7 @@ %files %defattr(-,root,root) -%config %{_sysconfdir}/rpm/macros.nodejs +%config %{_sysconfdir}/rpm/macros.%{name} %if 0%{?suse_version} >= 1320 %{_rpmconfigdir}/fileattrs/nodejs*.attr %endif ++++++ nodejs-packaging-pre1320-macros.patch ++++++ --- nodejs-packaging/macros.nodejs 2014-10-07 13:54:37.919948355 +0200 +++ macros.nodejs 2015-01-28 10:42:12.347176129 +0100 @@ -11,6 +11,13 @@ #compat %nodejs_modulesdir %{nodejs_sitelib} +%nodejs_requires \ +Requires: nodejs + +%nodejs_install \ +mkdir -p %{buildroot}%{nodejs_modulesdir} \ +npm_config_prefix=%{buildroot}%{_prefix} npm install -g %{S:0} + # currently installed nodejs version %nodejs_version %(%{__nodejs} -v | sed s/v//) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
