From 207e477ec071c461335522911faefe28bbe65bf9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 31 Jan 2016 12:14:05 +0000 Subject: [PATCH] nodejs-packaging-7 - nodejs-fixdep: add --move option - nodejs-symlink-deps: add --optional option - req: generate suggests for optional dependencies --- .gitignore | 1 + nodejs-packaging-caret.patch | 19 ------------------- nodejs-packaging.spec | 21 ++++++++++++++------- sources | 2 +- 4 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 nodejs-packaging-caret.patch diff --git a/.gitignore b/.gitignore index 78b0688..1b8498b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /nodejs-packaging-fedora-4.tar.xz /nodejs-packaging-fedora-6.tar.xz /nodejs-packaging-fedora-7.tar.xz +/nodejs-packaging-fedora-8.tar.xz diff --git a/nodejs-packaging-caret.patch b/nodejs-packaging-caret.patch deleted file mode 100644 index 6be8316..0000000 --- a/nodejs-packaging-caret.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 36e6f21081588f54b15c059e67576451ff457cdf -Author: Tom Hughes -Date: Mon Nov 16 17:20:04 2015 +0000 - - nodejs-symlink-deps: handle caret in versions - -diff --git a/nodejs-symlink-deps b/nodejs-symlink-deps -index 624293d..f984e3b 100755 ---- a/nodejs-symlink-deps -+++ b/nodejs-symlink-deps -@@ -78,7 +78,7 @@ def symlink_deps(deps, check): - - for dep, ver in deps.iteritems(): - if dep in mvpkgs and ver != '' and ver != '*': -- depver = ver.lstrip('~').split('.')[0] -+ depver = ver.lstrip('~^').split('.')[0] - target = os.path.join(sitelib, '{0}@{1}'.format(dep, depver)) - else: - target = os.path.join(sitelib, dep) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index 5495254..23f51dd 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,15 +1,13 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: nodejs-packaging -Version: 7 -Release: 5%{?dist} +Version: 8 +Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch License: MIT URL: https://fedoraproject.org/wiki/Node.js/Packagers Source0: https://fedorahosted.org/released/%{name}/%{name}-fedora-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1120868 -Patch0: nodejs-packaging-caret.patch ExclusiveArch: %{nodejs_arches} noarch #nodejs-devel before 0.10.12 provided these macros and owned /usr/share/node @@ -20,13 +18,15 @@ Requires: redhat-rpm-config This package contains RPM macros and other utilities useful for packaging Node.js modules and applications in RPM-based distributions. + %prep -%setup -qn %{name}-fedora-%{version} -%patch0 -p1 +%autosetup -p 1 -n %{name}-fedora-%{version} + %build #nothing to do + %install install -Dpm0644 macros.nodejs %{buildroot}%{macrosdir}/macros.nodejs install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr @@ -36,14 +36,21 @@ install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink- install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules + %files +%license LICENSE %{macrosdir}/macros.nodejs %{_rpmconfigdir}/fileattrs/nodejs*.attr %{_rpmconfigdir}/nodejs* %{_datadir}/node/multiver_modules -%doc LICENSE + %changelog +* Sun Jan 31 2016 Tom Hughes - 8-1 +- nodejs-fixdep: add --move option +- nodejs-symlink-deps: add --optional option +- req: generate suggests for optional dependencies + * Mon Nov 16 2015 Tom Hughes - 7-5 - nodejs-symlink-deps: handle caret in versions diff --git a/sources b/sources index af7265c..7e489e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92ee2847b0754ddeefef1972adeb7279 nodejs-packaging-fedora-7.tar.xz +765560d616f6b78fc5e54aa6d9fa146e nodejs-packaging-fedora-8.tar.xz