From e02219a5a012434b3d5bc4d8f5522386a5f91d56 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Fri, 27 Sep 2013 15:10:56 +0200 Subject: [PATCH] Add __default package specifier support --- ...e-__default-to-install-artifact-to-d.patch | 35 +++++++++++++++++++ xmvn.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0004-Add-special-value-__default-to-install-artifact-to-d.patch diff --git a/0004-Add-special-value-__default-to-install-artifact-to-d.patch b/0004-Add-special-value-__default-to-install-artifact-to-d.patch new file mode 100644 index 0000000..d263242 --- /dev/null +++ b/0004-Add-special-value-__default-to-install-artifact-to-d.patch @@ -0,0 +1,35 @@ +From b922db6aafe2c3680ab0cd340bb63f4b355993f5 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 27 Sep 2013 14:53:35 +0200 +Subject: [PATCH] Add special value __default to install artifact to default + package + +--- + .../src/main/java/org/fedoraproject/maven/installer/impl/Package.java | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java +index d0e33ba..0038e89 100644 +--- a/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java ++++ b/xmvn-core/src/main/java/org/fedoraproject/maven/installer/impl/Package.java +@@ -43,6 +43,8 @@ class Package + + public static final String MAIN = ""; + ++ private static final String DEFAULT_SUFFIX = "__default"; ++ + private static final String NOINSTALL_SUFFIX = "__noinstall"; + + private boolean pureDevelPackage = true; +@@ -53,7 +55,7 @@ class Package + { + this.settings = settings; + metadata = new FragmentFile( logger ); +- suffix = name.equals( "" ) ? "" : "-" + name; ++ suffix = ( name.equals( "" ) || name.equals( DEFAULT_SUFFIX ) ) ? "" : "-" + name; + } + + private final FragmentFile metadata; +-- +1.8.3.1 + diff --git a/xmvn.spec b/xmvn.spec index a9b0c2a..9cc401e 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -1,6 +1,6 @@ Name: xmvn Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: http://mizdebsk.fedorapeople.org/xmvn @@ -9,6 +9,7 @@ Source0: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar Patch0: 0001-Don-t-try-to-relativize-symlink-targets.patch Patch1: 0002-Try-to-resolve-cannonical-artifact-files.patch Patch2: 0003-Restotre-support-for-relative-symlinks.patch +Patch3: 0004-Add-special-value-__default-to-install-artifact-to-d.patch BuildRequires: maven >= 3.1.0 BuildRequires: maven-local @@ -38,6 +39,7 @@ This package provides %{summary}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Add cglib test dependency as a workaround for rhbz#911365 #pom_add_dep cglib:cglib::test %{name}-core @@ -147,6 +149,9 @@ end %doc LICENSE NOTICE %changelog +* Fri Sep 27 2013 Stanislav Ochotnicky - 1.0.2-3 +- Add __default package specifier support + * Mon Sep 23 2013 Mikolaj Izdebski - 1.0.2-2 - Don't try to relativize symlink targets - Restotre support for relative symlinks