rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

Accepting request 206332 from server:Kolab:Extras

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/206332
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=10
This commit is contained in:
Michal Vyskocil 2013-11-10 12:18:07 +00:00 committed by Git OBS Bridge
parent 2445806efb
commit e4ebe56231
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javapackages-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 8 17:06:25 UTC 2013 - aj@ajaissle.de
- BuildRequires xz
- Remove '/etc/java' and '/usr/share/java' from file list (both owned by system)
- Url changed
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 11 15:50:05 UTC 2013 - schwab@suse.de Wed Sep 11 15:50:05 UTC 2013 - schwab@suse.de

12
javapackages-tools.spec
View File

@ -27,7 +27,7 @@ Summary: Macros and scripts for Java packaging support
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Languages/Java Group: Development/Languages/Java
Url: https://fedorahosted.org/javapackages/ Url: https://git.fedorahosted.org/cgit/javapackages.git/
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
#PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits
# where Fedora use jpackage convention - usr/lib everywhere # where Fedora use jpackage convention - usr/lib everywhere
@ -35,9 +35,10 @@ Patch0: suse-use-libdir.patch
# PATCH-FIX-UPSTREAM Drain stdin in dependency generator # PATCH-FIX-UPSTREAM Drain stdin in dependency generator
Patch1: depgen.patch Patch1: depgen.patch
#BuildArch: noarch #BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: xz
Requires: coreutils Requires: coreutils
# for xsltproc # for xsltproc
@ -110,16 +111,19 @@ sed -i -e "s,^.*fileattrs/javadoc.attr,# out," install
sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
%if %{without mavenlocal} %if %{without mavenlocal}
pushd %{buildroot} cd %{buildroot}
rm etc/rpm/macros.xmvn \ rm etc/rpm/macros.xmvn \
etc/maven/metadata-org-apache-maven-plugins.xml \ etc/maven/metadata-org-apache-maven-plugins.xml \
etc/maven/metadata-org-codehaus-mojo.xml \ etc/maven/metadata-org-codehaus-mojo.xml \
usr/share/java-utils/xmvn_config_editor.sh \ usr/share/java-utils/xmvn_config_editor.sh \
usr/bin/mvn-* \ usr/bin/mvn-* \
usr/share/xmvn/configuration*.xml usr/share/xmvn/configuration*.xml
popd cd -
%endif %endif
mv files-common files-common-old
cat files-common-old | grep -v '^%dir /etc/java$' | grep -v '^%dir /usr/share/java$' > files-common
%files -f files-common %files -f files-common
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE %doc LICENSE