rpms/visualvm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into f19

Browse source 
Conflicts:
	visualvm.spec
This commit is contained in:
Mat Booth 2013-06-23 17:18:18 +01:00
commit ae8da37f25
1 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
visualvm.spec
View file

@ -3,12 +3,12 @@
Name: visualvm
Version: 1.3.3
Release: %{visualvmharnessver}.5%{?dist}
Release: %{visualvmharnessver}.6%{?dist}
Summary: Lightweight profiler that integrates many command-line JDK tools
Group: Development/Tools
License: GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL)
URL: http://visualvm.dev.java.net/
URL: http://visualvm.java.net/
Source0: %{dwnldurl}/visualvm_harness-%{visualvmharnessver}.tar.gz
Source1: %{dwnldurl}/visualvm_133-src.tar.gz
Source2: %{dwnldurl}/netbeans-profiler-visualvm_release701.tar.gz
@ -16,6 +16,8 @@ Patch0: visualvm-1.3.3-icons.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: wget
BuildRequires: java >= 1.6.0
BuildRequires: java-devel >= 1.6.0
@ -23,11 +25,10 @@ BuildRequires: apache-commons-logging
BuildRequires: desktop-file-utils
BuildRequires: netbeans-platform >= 6.9-1
BuildRequires: netbeans-platform-harness
BuildRequires: netbeans-apisupport
Requires: netbeans-platform >= 6.9-1
Requires: java >= 1.6.0
Requires: java-devel >= 1.6.0
Requires: netbeans-platform >= 6.9-1
Requires: java >= 1.6.0
Requires: java-devel >= 1.6.0
Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-47
@ -44,7 +45,7 @@ performance analysis for the Java SE platform.
%patch0 -p1
%build
autoreconf
autoreconf -i -f
./configure --prefix=/usr \
--with-visualvm-zip=%{SOURCE1} \
--with-netbeans-profiler-zip=%{SOURCE2} \
@ -95,7 +96,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Wed Apr 23 2013 Jiri Vanek <jvanek@redhat.com> - 1.3.3-1.3.5
* Sun Jun 23 2013 Mat Booth <fedora@matbooth.co.uk> - 1.3.3-1.3.6
- Correct upstream URL
- Fix mixed use of spaces and tabs
- Fix bogus changelog dates
- Remove spurious dep on netbeans-apisupport, fixes #914563
* Tue Apr 23 2013 Jiri Vanek <jvanek@redhat.com> - 1.3.3-1.3.5
- fixed versioning
- added autoreconf
@ -120,13 +127,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon Mar 21 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.2-1.2.8
- updated for hearness 1.2
* Fri Mar 8 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.2-1.2.7
* Tue Mar 8 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.2-1.2.7
- updated for vm 1.3.2
* Fri Feb 2 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-1.1.6
* Wed Feb 2 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-1.1.6
- fixed requires for java-devel, fixed conflicts version
* Wed Feb 1 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-1.1.5
* Tue Feb 1 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-1.1.5
- fixed requires for java-devel, fixed conflicts version
* Wed Jan 12 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-1.1.4
@ -135,7 +142,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Wed Jan 12 2011 Jiri Vanek <jvanek@redhat.com> - 1.3.1-3
- updated to harens 1.1
* Wed Nov 24 2010 Jiri Vanek <jvanek@redhat.com> - 1.3.1-2
- updated to harens 1.1pre
- removed file-changes fixed by upstream.
@ -154,22 +160,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- application moved from prefix to libdir/name
- removed fc15 from conficts, and increased release number of conflicted openjdk.
* Thu Nov 22 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-7
* Mon Nov 22 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-7
- removed /etc symlink
- patched jvisualvm luncher to follow to /etc instead of prefix/etc
* Thu Nov 16 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-6
* Tue Nov 16 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-6
- all simlinks and last modified moved from to install
* Thu Nov 16 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-5
* Tue Nov 16 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-5
- repaired missing slash at platform
* Thu Nov 15 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-4
* Mon Nov 15 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-4
- added symlinks for: etc, profiler, platform, visualvm
- sed and renaming of visualvm script
* Thu Oct 6 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-3
* Wed Oct 6 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-3
- fixed license file
- hacked empty files
- repaired .lastModified file to be tuched in post
@ -184,8 +189,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- (rev 3) removed _prefix/jvm/java-openjdk-jvisualvm/bin/jvisualvm and _prefix/jvm/java-openjdk-jvisualvm/share/visualvm.desktop (then jvm dir becomes empty - delete also. Both script and desktop file are before placed to right places.
- {_prefix}/jvm/java-openjdk-jvisualvm changed to {_prefix}
* Thu Oct 6 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-2
* Wed Oct 6 2010 Jiri Vanek <jvanek@redhat.com> - 1.3-2
- fixed noreplace config files
- applied patch visualvm-debuginfo