pool/velocity
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 198439 from Java:packages

Browse Source 
- use add_maven_depmap from javapackages-tools

- Move from jpackage-utils to javapackage-tools

OBS-URL: https://build.opensuse.org/request/show/198439
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/velocity?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal 2013-09-12 11:26:36 +00:00 committed by Git OBS Bridge
commit 809a455929
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
velocity.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 11 08:47:42 UTC 2013 - mvyskocil@suse.com
- use add_maven_depmap from javapackages-tools
-------------------------------------------------------------------
Mon Sep 9 11:06:25 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 17 12:17:24 UTC 2012 - mvyskocil@suse.com Mon Dec 17 12:17:24 UTC 2012 - mvyskocil@suse.com

37
velocity.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package velocity # spec file for package velocity
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,8 +16,6 @@
# #
%define section free
Name: velocity Name: velocity
Version: 1.5 Version: 1.5
Release: 0 Release: 0
@ -48,8 +46,8 @@ BuildRequires: commons-collections
BuildRequires: commons-lang BuildRequires: commons-lang
BuildRequires: hsqldb BuildRequires: hsqldb
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: jdom >= 1.0-1 BuildRequires: jdom >= 1.0-1
BuildRequires: jpackage-utils >= 1.7.4
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j >= 1.1 BuildRequires: log4j >= 1.1
BuildRequires: oro BuildRequires: oro
@ -57,8 +55,8 @@ BuildRequires: oro
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: servletapi4 BuildRequires: servletapi4
BuildRequires: werken-xpath BuildRequires: werken-xpath
Requires(post): jpackage-utils >= 1.7.4 Requires(post): javapackages-tools
Requires(postun): jpackage-utils >= 1.7.4 Requires(postun): javapackages-tools
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -208,36 +206,27 @@ ant \
%install %install
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar install -p -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.velocity velocity %{version} JPP %{name}
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# pom # pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE1} \ install -pm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# javadoc # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -rf docs/api rm -rf docs/api
# data # data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr convert examples test $RPM_BUILD_ROOT%{_datadir}/%{name}
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc LICENSE NOTICE README.txt %doc LICENSE NOTICE README.txt
%{_javadir}/*.jar %{_javadir}/*.jar
%{_datadir}/maven2/poms/* %{_mavenpomdir}/*
%config %{_mavendepmapfragdir} %config %{_mavendepmapfragdir}
%files manual %files manual
@ -246,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}
%files demo %files demo
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)