From 5539b65d317fa75cd5562db6d0a18afc01fead5c Mon Sep 17 00:00:00 2001 From: Jie Kang Date: Nov 07 2018 18:06:34 +0000 Subject: Clean up spec file source definitions --- diff --git a/dd-plist/dd-plist.spec b/dd-plist/dd-plist.spec index 66e8226..10d7354 100644 --- a/dd-plist/dd-plist.spec +++ b/dd-plist/dd-plist.spec @@ -6,8 +6,7 @@ Summary: A java library providing support for ASCII, XML and binary property License: MIT URL: https://github.com/3breadt/dd-plist -# original source: https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz -Source0: dd-plist-1.21.tar.gz +Source0: https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz BuildRequires: javapackages-tools BuildRequires: maven-assembly-plugin @@ -28,7 +27,7 @@ basic part of the Cocoa framework (OS X and iOS) as well as the GNUstep framewor %global debug_package %{nil} %prep -%setup -q +%autosetup -n dd-plist-dd-plist-1.21 %pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin diff --git a/dd-plist/generate-ddp_tarball.sh b/dd-plist/generate-ddp_tarball.sh index dca1efe..5bfa2b5 100755 --- a/dd-plist/generate-ddp_tarball.sh +++ b/dd-plist/generate-ddp_tarball.sh @@ -1,8 +1,3 @@ #!/bin/bash -wget https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz -tar xzf dd-plist-1.21.tar.gz -rm dd-plist-1.21.tar.gz -mv dd-plist-dd-plist-1.21 dd-plist-1.21/ -tar czf dd-plist-1.21.tar.gz dd-plist-1.21/ -rm -r dd-plist-1.21 \ No newline at end of file +wget https://github.com/3breadt/dd-plist/archive/dd-plist-1.21.tar.gz \ No newline at end of file diff --git a/directory-maven-plugin/directory-maven-plugin.spec b/directory-maven-plugin/directory-maven-plugin.spec index 9a85dd5..c46e70f 100644 --- a/directory-maven-plugin/directory-maven-plugin.spec +++ b/directory-maven-plugin/directory-maven-plugin.spec @@ -6,8 +6,7 @@ Summary: The directory-maven-plugin helps establish locations for files in mu License: Apache-2.0 URL: https://github.com/jdcasey/directory-maven-plugin -# original source: https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz -Source0: directory-maven-plugin-0.3.1.tar.gz +Source0: https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz BuildRequires: javapackages-tools BuildRequires: maven-local @@ -32,7 +31,7 @@ plugin parameter. %global debug_package %{nil} %prep -%setup -q +%autosetup -n directory-maven-plugin-directory-maven-plugin-0.3.1 %build %mvn_build diff --git a/directory-maven-plugin/generate_dmp_tarball.sh b/directory-maven-plugin/generate_dmp_tarball.sh index 9193e35..7c447fc 100755 --- a/directory-maven-plugin/generate_dmp_tarball.sh +++ b/directory-maven-plugin/generate_dmp_tarball.sh @@ -1,8 +1,3 @@ #!/bin/bash -wget https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz -tar xzf directory-maven-plugin-0.3.1.tar.gz -rm directory-maven-plugin-0.3.1.tar.gz -mv directory-maven-plugin-directory-maven-plugin-0.3.1/ directory-maven-plugin-0.3.1 -tar czf directory-maven-plugin-0.3.1.tar.gz directory-maven-plugin-0.3.1/ -rm -r directory-maven-plugin-0.3.1 \ No newline at end of file +wget https://github.com/jdcasey/directory-maven-plugin/archive/directory-maven-plugin-0.3.1.tar.gz \ No newline at end of file diff --git a/ee4j/ee4j.spec b/ee4j/ee4j.spec index 91957bf..7718111 100644 --- a/ee4j/ee4j.spec +++ b/ee4j/ee4j.spec @@ -18,7 +18,7 @@ implementations of those APIs, and technology compatibility kits for Java runtim that enable development, deployment, and management of server-side and cloud-native applications. %prep -%setup -q +%autosetup -n ee4j-1.0.1 mv %{_builddir}/%{name}-%{version}/parent/pom.xml %{_builddir}/%{name}-%{version}/pom.xml rm -r %{_builddir}/%{name}-%{version}/parent/ diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec index 70e184f..a6ea4fb 100644 --- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec +++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec @@ -6,8 +6,7 @@ Summary: Small Maven plugin to "fix" the Info.plist file generated by p2 duri License: EPL-1.0 URL: https://github.com/buchen/fix-info-plist-maven-plugin -# original source: https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.tar.gz -Source0: fix-info-plist-maven-plugin-1.2.tar.gz +Source0: https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.tar.gz Patch0: 0_update_ddp_version.patch @@ -30,7 +29,7 @@ plugin to provide a custom Info.plist file for Eclipse RCP product. %global debug_package %{nil} %prep -%setup -q +%setup -q -n fix-info-plist-maven-plugin-1.2 %patch0 -p1 diff --git a/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh b/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh index d5e1330..aa0faea 100755 --- a/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh +++ b/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh @@ -1,7 +1,3 @@ #!/bin/bash -wget https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.tar.gz -tar xzf 1.2.tar.gz -rm 1.2.tar.gz -tar czf fix-info-plist-maven-plugin-1.2.tar.gz fix-info-plist-maven-plugin-1.2/ -rm -r fix-info-plist-maven-plugin-1.2 \ No newline at end of file +wget https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.tar.gz \ No newline at end of file diff --git a/jaf/0_add_manifest.patch b/jaf/0_add_manifest.patch index fab4863..1566647 100644 --- a/jaf/0_add_manifest.patch +++ b/jaf/0_add_manifest.patch @@ -1,7 +1,9 @@ -diff -Nur jaf-1.2.0-orig/activation/META-INF/MANIFEST.MF jaf-1.2.0/activation/META-INF/MANIFEST.MF ---- jaf-1.2.0-orig/activation/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ jaf-1.2.0/activation/META-INF/MANIFEST.MF 2018-09-21 13:08:38.421266097 -0400 -@@ -0,0 +1,33 @@ +diff --git a/activation/META-INF/MANIFEST.MF b/activation/META-INF/MANIFEST.MF +new file mode 100644 +index 0000000..8896afe +--- /dev/null ++++ b/activation/META-INF/MANIFEST.MF +@@ -0,0 +1,32 @@ +Manifest-Version: 1.0 +Bundle-License: http://www.eclipse.org/org/documents/edl-v10.php +Bundle-SymbolicName: com.sun.activation.javax.activation @@ -34,11 +36,12 @@ diff -Nur jaf-1.2.0-orig/activation/META-INF/MANIFEST.MF jaf-1.2.0/activation/ME +Created-By: 1.8.0_181 (Oracle Corporation) +Build-Jdk: 1.8.0_181 +Specification-Version: 1.2 -+ -diff -Nur jaf-1.2.0-orig/activationapi/META-INF/MANIFEST.MF jaf-1.2.0/activationapi/META-INF/MANIFEST.MF ---- jaf-1.2.0-orig/activationapi/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ jaf-1.2.0/activationapi/META-INF/MANIFEST.MF 2018-09-21 13:08:50.165206110 -0400 -@@ -0,0 +1,32 @@ +diff --git a/activationapi/META-INF/MANIFEST.MF b/activationapi/META-INF/MANIFEST.MF +new file mode 100644 +index 0000000..4e9185f +--- /dev/null ++++ b/activationapi/META-INF/MANIFEST.MF +@@ -0,0 +1,31 @@ +Manifest-Version: 1.0 +Bundle-License: http://www.eclipse.org/org/documents/edl-v10.php +Bundle-SymbolicName: javax.activation-api @@ -70,4 +73,3 @@ diff -Nur jaf-1.2.0-orig/activationapi/META-INF/MANIFEST.MF jaf-1.2.0/activation +Created-By: 1.8.0_181 (Oracle Corporation) +Build-Jdk: 1.8.0_181 +Specification-Version: 1.2 -+ diff --git a/jaf/generate_jaf_tarball.sh b/jaf/generate_jaf_tarball.sh index 152b600..96293d6 100755 --- a/jaf/generate_jaf_tarball.sh +++ b/jaf/generate_jaf_tarball.sh @@ -1,8 +1,3 @@ #!/bin/bash wget https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz -tar xzf initial-contribution.tar.gz -rm initial-contribution.tar.gz -mv jaf-initial-contribution/ jaf-1.2.1/ -tar czf jaf-1.2.1.tar.gz jaf-1.2.1/ -rm -r jaf-1.2.1 diff --git a/jaf/jaf.spec b/jaf/jaf.spec index 4e7e008..9dc3d83 100644 --- a/jaf/jaf.spec +++ b/jaf/jaf.spec @@ -1,3 +1,5 @@ +%global tarball_name jaf-initial-contribution + Name: jaf Version: 1.2.1 Release: 1%{?dist} @@ -6,8 +8,7 @@ Summary: JavaBeans Activation Framework License: CDDL-1.1 URL: https://github.com/eclipse-ee4j/jaf -# original source: https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz -Source0: jaf-1.2.1.tar.gz +Source0: https://github.com/eclipse-ee4j/jaf/archive/initial-contribution.tar.gz Patch0: 0_add_manifest.patch @@ -33,21 +34,21 @@ discover the operations available on it; and instantiate the appropriate bean to perform the operation(s). %prep -%setup -q +%setup -q -n %{tarball_name} +%patch0 -p1 %pom_disable_module demo -%patch0 -p1 -mkdir -p %{_builddir}/%{name}-%{version}/activationapi/target/sources/ -cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/javax/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ -cp -r %{_builddir}/%{name}-%{version}/activation/src/main/java/com/ %{_builddir}/%{name}-%{version}/activationapi/target/sources/ +mkdir -p %{_builddir}/%{tarball_name}/activationapi/target/sources/ +cp -r %{_builddir}/%{tarball_name}/activation/src/main/java/javax/ %{_builddir}/%{tarball_name}/activationapi/target/sources/ +cp -r %{_builddir}/%{tarball_name}/activation/src/main/java/com/ %{_builddir}/%{tarball_name}/activationapi/target/sources/ -mkdir -p %{_builddir}/%{name}-%{version}/activation/target/classes -cp -r %{_builddir}/%{name}-%{version}/activation/META-INF %{_builddir}/%{name}-%{version}/activation/target/classes/ +mkdir -p %{_builddir}/%{tarball_name}/activation/target/classes +cp -r %{_builddir}/%{tarball_name}/activation/META-INF %{_builddir}/%{tarball_name}/activation/target/classes/ -mkdir -p %{_builddir}/%{name}-%{version}/activationapi/target/classes -cp -r %{_builddir}/%{name}-%{version}/activationapi/META-INF %{_builddir}/%{name}-%{version}/activationapi/target/classes/ +mkdir -p %{_builddir}/%{tarball_name}/activationapi/target/classes +cp -r %{_builddir}/%{tarball_name}/activationapi/META-INF %{_builddir}/%{tarball_name}/activationapi/target/classes/ %build %mvn_build