rpms/xmvn
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add __default package specifier support

Browse Source
This commit is contained in:
Stanislav Ochotnicky 2013-09-27 15:10:56 +02:00
parent e8e064528a
commit e02219a5a0
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0004-Add-special-value-__default-to-install-artifact-to-d.patch Normal file
View File

@ -0,0 +1,35 @@
From b922db6aafe2c3680ab0cd340bb63f4b355993f5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
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

7
xmvn.spec
View File

@ -1,6 +1,6 @@
Name: xmvn Name: xmvn
Version: 1.0.2 Version: 1.0.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Local Extensions for Apache Maven Summary: Local Extensions for Apache Maven
License: ASL 2.0 License: ASL 2.0
URL: http://mizdebsk.fedorapeople.org/xmvn 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 Patch0: 0001-Don-t-try-to-relativize-symlink-targets.patch
Patch1: 0002-Try-to-resolve-cannonical-artifact-files.patch Patch1: 0002-Try-to-resolve-cannonical-artifact-files.patch
Patch2: 0003-Restotre-support-for-relative-symlinks.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 >= 3.1.0
BuildRequires: maven-local BuildRequires: maven-local
@ -38,6 +39,7 @@ This package provides %{summary}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# Add cglib test dependency as a workaround for rhbz#911365 # Add cglib test dependency as a workaround for rhbz#911365
#pom_add_dep cglib:cglib::test %{name}-core #pom_add_dep cglib:cglib::test %{name}-core
@ -147,6 +149,9 @@ end
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Fri Sep 27 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.2-3
- Add __default package specifier support
* Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.2-2 * Mon Sep 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.2-2
- Don't try to relativize symlink targets - Don't try to relativize symlink targets
- Restotre support for relative symlinks - Restotre support for relative symlinks