[maven-checkstyle-plugin] Updated to 2.7 + Guidelines fixes
by Stanislav Ochotnicky
commit 340d2c6142548ee788a0990cc510996a9c15628a
Author: Tomas Radej <tradej(a)redhat.com>
Date: Tue Sep 20 16:07:05 2011 +0200
Updated to 2.7 + Guidelines fixes
.gitignore | 5 +++
maven-checkstyle-plugin-maven-core-dep.patch | 16 ++++++++++
maven-checkstyle-plugin.spec | 39 +++++++++++++------------
sources | 2 +-
4 files changed, 42 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66e6512..6272e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
maven-checkstyle-plugin-2.5-source-release.zip
/maven-checkstyle-plugin-2.6-source-release.zip
+maven-checkstyle-plugin-2.7-source-release.zip
+/noarch
+/maven-checkstyle-plugin-2.7
+/maven-checkstyle-plugin-2.7-1.fc17.src.rpm
+/maven-checkstyle-plugin-2_7-1_fc17
diff --git a/maven-checkstyle-plugin-maven-core-dep.patch b/maven-checkstyle-plugin-maven-core-dep.patch
new file mode 100644
index 0000000..a5a38c3
--- /dev/null
+++ b/maven-checkstyle-plugin-maven-core-dep.patch
@@ -0,0 +1,16 @@
+diff --git a/pom.xml b/pom.xml
+index 1064dfc..2f5be46 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -69,6 +69,11 @@ under the License.
+ <!-- maven -->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-core</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-checkstyle-plugin.spec b/maven-checkstyle-plugin.spec
index 74fd018..413a354 100644
--- a/maven-checkstyle-plugin.spec
+++ b/maven-checkstyle-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-checkstyle-plugin
-Version: 2.6
-Release: 5%{?dist}
+Version: 2.7
+Release: 1%{?dist}
Summary: Plugin that generates a report regarding the code style used by the developers
Group: Development/Libraries
License: ASL 2.0
@@ -8,6 +8,8 @@ URL: http://maven.apache.org/plugins/%{name}
Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
+Patch0: %{name}-maven-core-dep.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -19,10 +21,14 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin >= 2.0.2
BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-jar-plugin >= 2.2
BuildRequires: maven-install-plugin >= 2.2
BuildRequires: checkstyle >= 5.0
BuildRequires: plexus-cli >= 1.2
+BuildRequires: maven-artifact-manager
+BuildRequires: plexus-resources
Requires: maven
Requires: maven-shared-reporting-impl >= 2.0.4.3
@@ -41,8 +47,6 @@ Requires: maven-plugin-testing-harness >= 1.2
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Provides: maven2-plugin-checkstyle = %{version}-%{release}
Obsoletes: maven2-plugin-checkstyle <= 0:2.0.8
@@ -61,13 +65,13 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
#adapt to upstream checkstyle groupId
sed -i -e "s|<groupId>checkstyle|<groupId>com.puppycrawl.tools|g" pom.xml
%build
-mvn-rpmbuild \
- -Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+# During testing, component descriptors can't be found.
+mvn-rpmbuild install javadoc:aggregate -Dmaven.test.failure.ignore
%install
# jars
@@ -77,31 +81,28 @@ install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.ja
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%postun
-%update_maven_depmap
%files
%doc LICENSE
%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
%doc LICENSE
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Thu Sep 15 2011 Tomas Radej <tradej(a)redhat.com> - 2.7-1
+- Updated to 2.7
+- Guideline fixes
+
* Thu Jun 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.6-5
- Fix checkstyle groupId.
diff --git a/sources b/sources
index 1754d95..84772d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6c8cb3a574029b4eaa2d0f24df7d2ba maven-checkstyle-plugin-2.6-source-release.zip
+56a4e7c1b5b68280bf9b8f02e11443b9 maven-checkstyle-plugin-2.7-source-release.zip
12 years, 6 months
[maven-archiver] Fixed dep, minor fixes
by tradej@fedoraproject.org
Summary of changes:
456f787... Fixed dep, minor fixes (*)
(*) This commit already existed in another branch; no separate mail sent
12 years, 6 months
[maven-archiver/f16] Fixed dep, minor fixes
by tradej@fedoraproject.org
commit 456f787bf75f1cd5a71c9c3767f7eeacff1c8f16
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Sep 19 11:29:40 2011 +0200
Fixed dep, minor fixes
maven-archiver-maven-core-dep.patch | 22 ++++++++++++++++++++++
maven-archiver.spec | 19 ++++++++++++-------
2 files changed, 34 insertions(+), 7 deletions(-)
---
diff --git a/maven-archiver-maven-core-dep.patch b/maven-archiver-maven-core-dep.patch
new file mode 100644
index 0000000..4ea50e7
--- /dev/null
+++ b/maven-archiver-maven-core-dep.patch
@@ -0,0 +1,22 @@
+diff --git a/pom.xml b/pom.xml
+index 365b10b..6f0f82b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -53,11 +53,16 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+- <artifactId>maven-artifact</artifactId>
++ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ <version>${mavenVersion}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
diff --git a/maven-archiver.spec b/maven-archiver.spec
index 3064f39..415079d 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -30,7 +30,7 @@
Name: maven-archiver
Version: 2.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Maven Archiver
License: ASL 2.0
@@ -42,6 +42,8 @@ URL: http://maven.apache.org/
Source0: %{name}-%{version}-src.tar.xz
Source1: %{name}-depmap.xml
+Patch0: %{name}-maven-core-dep.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
@@ -67,8 +69,6 @@ Requires: plexus-archiver >= 1.0-0.1.a7
Requires: plexus-interpolation
Requires: plexus-utils
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
Provides: maven-shared-archiver = %{version}-%{release}
Obsoletes: maven-shared-archiver < %{version}-%{release}
@@ -86,6 +86,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
+%patch0 -p1
#tests don't compile with maven 2.2.1
rm -fr src/test/java/org/apache/maven/archiver/*.java
@@ -104,9 +105,9 @@ install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# Copy pom
-install -pm 644 pom.xml \
- $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
-%add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -114,13 +115,17 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%{_javadir}/*
-%{_mavenpomdir}/JPP-maven-archiver.pom
+%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
%doc %{_javadocdir}/*
%changelog
+* Mon Sep 19 2011 Tomas Radej <tradej(a)redhat.com> - 0:2.4.1-7
+- Fixed dep on maven-core artifact
+- Minor fixes
+
* Wed Jun 8 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:2.4.1-6
- Build with maven 3.x.
12 years, 6 months
[Bug 738323] New: mvn3 fails to compile openhab
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: mvn3 fails to compile openhab
https://bugzilla.redhat.com/show_bug.cgi?id=738323
Summary: mvn3 fails to compile openhab
Product: Fedora
Version: 15
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven
AssignedTo: sochotni(a)redhat.com
ReportedBy: kbaker(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: ---
Created attachment 523167
--> https://bugzilla.redhat.com/attachment.cgi?id=523167
output from F15's maven `mvn3 clean install -X`
Description of problem:
mvn3 on F15 fails to build openhab with "Equinox runtime location is missing or
invalid"
Version-Release number of selected component (if applicable):
maven-3.0.3-7.fc15.noarch : Java project management and project comprehension
tool
Repo : installed
How reproducible:
Steps to Reproduce:
1. rm -rf ~/.m2
2. hg clone -r d190dd74639b https://code.google.com/p/openhab/
openhab-d190dd74639b
3. cd openhab-d190dd74639b
4. mvn3 clean install -X
much output - see attached.
4. [ERROR] Internal error: java.lang.RuntimeException:
java.lang.RuntimeException: Equinox runtime location is missing or
invalid -> [Help 1]
org.apache.maven.InternalErrorException: Internal error:
java.lang.RuntimeException: java.lang.RuntimeException: Equinox
runtime location is missing or invalid
Compare with apache maven 3.0.3 - Same as above steps 1-3 but
4. download maven from
http://www.apache.org/dyn/closer.cgi/maven/binaries/apache-maven-3.0.3-bi...
5. run with apache maven
=== SCRIPT ======================================
#!/bin/bash
MAVEN_PATH=/path/to/apache-maven-3.0.3
export PATH=$MAVEN_PATH/bin:$PATH
which mvn
rm -rf ~/.m2
cd openhab-d190dd74639b
mvn clean install -X
=== SCRIPT END ==================================
6. completes ok
Actual results:
Expected results:
F15 maven would work like the apache version
Additional info:
uname -a
Linux kyokushin 2.6.40.4-5.fc15.x86_64 #1 SMP Tue Aug 30 14:38:32 UTC 2011
x86_64 x86_64 x86_64 GNU/Linux
Maven output at start of run:
Apache Maven 3.0.3 (rNON-CANONICAL_2011-06-28_15-20_mockbuild;
2011-06-28 11:20:31-0400)
Maven home: /usr/share/maven
Java version: 1.6.0_22, vendor: Sun Microsystems Inc.
Java home: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "2.6.40.4-5.fc15.x86_64", arch: "amd64",
family: "unix"
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 6 months
[objectweb-asm] Use poms produced by the build not foreign ones.
by Alexander Kurtakov
commit 8203106c1bd2e1dcf86451c45b3dfaf9a1244d77
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Sep 16 17:11:05 2011 +0300
Use poms produced by the build not foreign ones.
Adapt to current guidelines.
asm-3.3.1.pom | 14 -----
asm-all-3.3.1.pom | 15 -----
asm-analysis-3.3.1.pom | 21 -------
asm-commons-3.3.1.pom | 21 -------
asm-parent-3.3.1.pom | 144 ------------------------------------------------
asm-tree-3.3.1.pom | 21 -------
asm-util-3.3.1.pom | 21 -------
asm-xml-3.3.1.pom | 21 -------
objectweb-asm.spec | 83 +++++++++-------------------
9 files changed, 26 insertions(+), 335 deletions(-)
---
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index 22e6070..d4f8313 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -28,26 +28,16 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define section free
-
Name: objectweb-asm
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
URL: http://asm.objectweb.org/
Group: Development/Libraries/Java
Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom
-Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom
-Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
-Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
-Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom
-Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom
-Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom
-Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
-Source9: asm-MANIFEST.MF
+Source1: asm-MANIFEST.MF
Patch0: objectweb-asm-no-classpath-in-manifest.patch
# Needed by asm-xml.jar
Requires: xml-commons-jaxp-1.3-apis
@@ -60,14 +50,13 @@ BuildRequires: objectweb-anttask
BuildRequires: xml-commons-jaxp-1.3-apis
BuildRequires: zip
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
ASM is a code manipulation tool to implement adaptable systems.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
%description javadoc
Javadoc for %{name}.
@@ -78,79 +67,59 @@ Javadoc for %{name}.
perl -pi -e 's/\r$//g' LICENSE.txt README.txt
mkdir META-INF
-cp -p %{SOURCE9} META-INF/MANIFEST.MF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
%build
-export CLASSPATH=
-export OPT_JAR_LIST=:
ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for jar in output/dist/lib/*.jar; do
install -m 644 ${jar} \
-$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}`
+$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}`
done
touch META-INF/MANIFEST.MF
zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF
-install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
-
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar
+install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm.pom
-%add_to_maven_depmap asm asm %{version} JPP/objectweb-asm asm
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-analysis.pom
-%add_to_maven_depmap asm asm-analysis %{version} JPP/objectweb-asm asm-analysis
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-commons.pom
-%add_to_maven_depmap asm asm-commons %{version} JPP/objectweb-asm asm-commons
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-tree.pom
-%add_to_maven_depmap asm asm-tree %{version} JPP/objectweb-asm asm-tree
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-util.pom
-%add_to_maven_depmap asm asm-util %{version} JPP/objectweb-asm asm-util
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-xml.pom
-%add_to_maven_depmap asm asm-xml %{version} JPP/objectweb-asm asm-xml
-install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-all.pom
-%add_to_maven_depmap asm asm-all %{version} JPP/objectweb-asm asm-all
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-parent.pom
-%add_to_maven_depmap asm asm-parent %{version} JPP/objectweb-asm asm-parent
+for pom in output/dist/lib/*.pom; do
+install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}`
+done
+%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar
+%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar
+%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar
+%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar
+%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar
+%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar
+%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar
+%add_maven_depmap JPP.objectweb-asm-asm-parent.pom
# javadoc
-install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
-%{_datadir}/maven2/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Sep 16 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:3.3.1-2
+- Use poms produced by the build not foreign ones.
+- Adpat to current guidelines.
+
* Mon Apr 04 2011 Chris Aniszczyk <zx(a)redhat.com> 0:3.3.1
- Upgrade to 3.3.1
12 years, 6 months
[icu4j] Adapt to current guidelines.
by Alexander Kurtakov
commit 21fffd999b38c2dace11b7389685caaf749f7049
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Sep 16 00:12:31 2011 +0300
Adapt to current guidelines.
Rebuild for OSGi provides.
icu4j.spec | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/icu4j.spec b/icu4j.spec
index a5fe570..fe37e8a 100644
--- a/icu4j.spec
+++ b/icu4j.spec
@@ -30,8 +30,6 @@
%global with_eclipse 1
-%global section free
-
%global eclipse_base %{_libdir}/eclipse
# Note: this next section looks weird having an arch specified in a
# noarch specfile but the parts of the build
@@ -44,7 +42,7 @@
Name: icu4j
Version: 4.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
Summary: International Components for Unicode for Java
License: MIT and EPL
@@ -64,8 +62,6 @@ BuildRequires: java-javadoc >= 1:1.6.0
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.5
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
# This is to ensure we get OpenJDK and not GCJ
Requires: java >= 1:1.6.0
%if %{with_eclipse}
@@ -141,9 +137,8 @@ popd
%__cp -ap %{name}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
+%__cp -pr doc/* %{buildroot}%{_javadocdir}/%{name}
%if %{with_eclipse}
# eclipse
@@ -155,28 +150,19 @@ unzip -qq -d %{buildroot}/%{eclipse_base} eclipse-build/out/projects/ICU4J.com.i
# maven stuff
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap com.ibm.icu %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
-%defattr(-,root,root,-)
%doc readme.html APIChangeReport.html
%{_javadir}/%{name}*.jar
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%if %{with_eclipse}
%files eclipse
-%defattr(-,root,root,-)
%dir %{_libdir}/eclipse
%dir %{_libdir}/eclipse/features
%dir %{_libdir}/eclipse/plugins
@@ -186,6 +172,9 @@ cp %{name}-4.4.2.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%endif
%changelog
+* Fri Sep 16 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-3
+- Adapt to current guidelines.
+
* Mon May 9 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1:4.4.2-2
- Use proper tarball.
- Fix build.
12 years, 6 months
[jsch] Guidelines fixes.
by Alexander Kurtakov
commit b2fd24b0a732d9e43ec83509ff545de3e80e9603
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Sep 15 23:26:08 2011 +0300
Guidelines fixes.
Rebuild for OSGi provides.
jsch.spec | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/jsch.spec b/jsch.spec
index 9b5b8ba..9624285 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -30,7 +30,7 @@
Name: jsch
Version: 0.1.44
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Pure Java implementation of SSH2
Group: Development/Libraries
@@ -94,40 +94,35 @@ zip dist/lib/%{name}-*.jar META-INF/MANIFEST.MF
%install
# jars
-rm -rf $RPM_BUILD_ROOT
install -Dpm 644 dist/lib/%{name}-*.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# examples
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -pr examples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%{_javadir}/*.jar
%doc LICENSE.txt
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}*
%doc LICENSE.txt
%files demo
-%defattr(-,root,root,-)
%doc %{_datadir}/%{name}*
%doc LICENSE.txt
%changelog
+* Thu Sep 15 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:0.1.44-4
+- Guidelines fixes.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:0.1.44-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
12 years, 6 months