From 15afaaf6b8936a81d00656788ffdcab6ce972105 Mon Sep 17 00:00:00 2001 From: wangge Date: Tue, 1 Sep 2020 16:53:45 +0800 Subject: [PATCH 1/3] modify file path to solve other package compiler err --- glassfish-legal.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glassfish-legal.spec b/glassfish-legal.spec index ecf0eed..bb2fa7b 100644 --- a/glassfish-legal.spec +++ b/glassfish-legal.spec @@ -14,9 +14,11 @@ An archive which contains license files for glassfish code. %prep %setup -c %{name}-%{version} +mkdir -p src/main/resources +mv META-INF/ src/main/resources cp %{SOURCE1} ./pom.xml -sed -i 's/\r//' META-INF/LICENSE.txt -cp -p META-INF/LICENSE.txt . +sed -i 's/\r//' src/main/resources/META-INF/LICENSE.txt +cp -p src/main/resources/META-INF/LICENSE.txt . %mvn_file :legal %{name} %build From 59aa8b8c8cd0b56dd699e656480ab84dfe87a425 Mon Sep 17 00:00:00 2001 From: wangge Date: Wed, 2 Sep 2020 17:23:03 +0800 Subject: [PATCH 2/3] Change file path --- glassfish-legal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-legal.spec b/glassfish-legal.spec index bb2fa7b..6fa65d0 100644 --- a/glassfish-legal.spec +++ b/glassfish-legal.spec @@ -1,6 +1,6 @@ Name: glassfish-legal Version: 1.1 -Release: 1 +Release: 2 Summary: Legal License for glassfish code License: CDDL or GPLv2 with exceptions URL: http://glassfish.java.net/ @@ -33,3 +33,6 @@ cp -p src/main/resources/META-INF/LICENSE.txt . %changelog * Sat Aug 1 2020 Ge Wang - 1.1-1 - package init + +* Wen Sept 2 2020 Ge Wang - 1.1-2 +- change META-INF path to solve glassfish-annotation-api build problem From f0580234ad24d4309e1c3c947e124d7cbf031386 Mon Sep 17 00:00:00 2001 From: wangge Date: Thu, 3 Sep 2020 15:58:45 +0800 Subject: [PATCH 3/3] modify changelog --- glassfish-legal.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glassfish-legal.spec b/glassfish-legal.spec index 6fa65d0..e2cd5b4 100644 --- a/glassfish-legal.spec +++ b/glassfish-legal.spec @@ -31,8 +31,9 @@ cp -p src/main/resources/META-INF/LICENSE.txt . %license LICENSE.txt %changelog +* Wen Sept 2 2020 Ge Wang - 1.1-2 +- change META-INF path to solve glassfish-annotation-api build problem + * Sat Aug 1 2020 Ge Wang - 1.1-1 - package init -* Wen Sept 2 2020 Ge Wang - 1.1-2 -- change META-INF path to solve glassfish-annotation-api build problem