rpms/eclipse-subclipse/devel subclipse-fetch-1.4.7.sh, NONE, 1.1 .cvsignore, 1.6, 1.7 eclipse-subclipse.spec, 1.25, 1.26 sources, 1.6, 1.7 eclipse-subclipse-1.2.2-default-svnkit.patch, 1.1, NONE eclipse-subclipse-1.2.4-plugin-classpath.patch, 1.1, NONE subclipse-fetch-1.2.4.sh, 1.1, NONE
Robert Marcano
robmv at fedoraproject.org
Tue Feb 24 16:12:06 UTC 2009
Author: robmv
Update of /cvs/extras/rpms/eclipse-subclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3096
Modified Files:
.cvsignore eclipse-subclipse.spec sources
Added Files:
subclipse-fetch-1.4.7.sh
Removed Files:
eclipse-subclipse-1.2.2-default-svnkit.patch
eclipse-subclipse-1.2.4-plugin-classpath.patch
subclipse-fetch-1.2.4.sh
Log Message:
- Update to upstream 1.4.7
- eclipse-subclipse-book is obsoleted, not provided upstream
- New eclipse-subclipse-graph subpackage
--- NEW FILE subclipse-fetch-1.4.7.sh ---
#!/bin/sh
VERSION=1.4.7
svn export --username guest --password "" http://subclipse.tigris.org/svn/subclipse/tags/subclipse/$VERSION/subclipse subclipse-$VERSION
rm -rf ./subclipse-$VERSION/org.tigris.subversion.clientadapter.javahl.win32
tar -czf subclipse-$VERSION.tgz subclipse-$VERSION
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 10 Sep 2007 15:18:16 -0000 1.6
+++ .cvsignore 24 Feb 2009 16:11:35 -0000 1.7
@@ -1 +1 @@
-subclipse-1.2.4.tgz
+subclipse-1.4.7.tgz
Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/eclipse-subclipse.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- eclipse-subclipse.spec 24 Feb 2009 13:56:15 -0000 1.25
+++ eclipse-subclipse.spec 24 Feb 2009 16:11:36 -0000 1.26
@@ -1,194 +1,118 @@
-%define gcj_support 0
-
%define eclipse_name eclipse
%define eclipse_base %{_libdir}/%{eclipse_name}
%define install_loc %{_datadir}/eclipse/dropins
-%define core_plugin_jar %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}.jar
-%define core_plugin_dir %{install_loc}/subclipse/eclipse/plugins/org.tigris.subversion.subclipse.core_%{version}
-
-%define disable_javahl 0
-%if 0%{?fedora} == 6
-%define disable_javahl 1
-%endif
-%if 0%{?rhel} == 5
-%define disable_javahl 1
-%endif
-
-%define javahl_dir %{_libdir}/svn-javahl
-%if 0%{?fedora} >= 8
-%define javahl_dir %{_javadir}
-%endif
Name: eclipse-subclipse
-Version: 1.2.4
-Release: 13%{?dist}
+Version: 1.4.7
+Release: 1%{?dist}
Summary: Subversion Eclipse plugin
-Group: Text Editors/Integrated Development Environments (IDE)
-License: EPL
+Group: Development/Tools
+License: EPL and CC-BY
URL: http://subclipse.tigris.org/
Source0: subclipse-%{version}.tgz
# Script to fetch the source code
-# the new source tarball does not includes the book feature and the layout is
-# different than the source repository
-Source10: subclipse-fetch-1.2.4.sh
-# Disable javahl support temporaly until apparent classloader problem is fixed
-Patch0: eclipse-subclipse-1.2.2-default-svnkit.patch
-Patch1: eclipse-subclipse-1.2.4-plugin-classpath.patch
+Source10: subclipse-fetch-%{version}.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: coreutils
BuildRequires: eclipse-pde
-%if %{gcj_support}
-BuildRequires: gcc-java >= 4.0.2
-BuildRequires: java-gcj-compat-devel >= 1.0.33
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
-%else
-BuildRequires: java-devel >= 1.4.2
-%endif
-
-%if %{gcj_support}
-%else
-BuildArch: noarch
-%endif
-
+BuildRequires: eclipse-gef
Requires: eclipse-platform
-BuildRequires: subversion-javahl >= 1.3.1
-Requires: subversion-javahl >= 1.3.1
-BuildRequires: svnkit >= 1.1.2
-Requires: svnkit >= 1.1.2
-BuildRequires: ganymed-ssh2 >= 209
-Requires: ganymed-ssh2 >= 209
-
-%package book
-Summary: Subversion book
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
+BuildRequires: svnkit >= 1.2.2
+Requires: svnkit >= 1.2.2
+Obsoletes: eclipse-subclipse-book < 1.4
%description
Subclipse is an Eclipse plugin that adds Subversion integration to the Eclipse
IDE.
-%description book
-The Subversion book as an Eclipse documentation plugin.
+%package graph
+Summary: Subversion Revision Graph
+Group: Development/Tools
+
+Requires: %{name} = %{version}
+Requires: eclipse-gef
+
+%description graph
+Subversion Revision Graph for Subclipse.
%prep
%setup -q -n subclipse-%{version}
-%if 0%{disable_javahl}
-%patch0 -p1
-%endif
-%patch1 -p1
-
-# delete the jars that are in the archive
-rm svnClientAdapter/lib/svnjavahl.jar
-ln -s %{javahl_dir}/svn-javahl.jar svnClientAdapter/lib/svnjavahl.jar
-rm -f svnClientAdapter/lib/svnkit.jar
-ln -s %{_javadir}/svnkit.jar svnClientAdapter/lib/svnkit.jar
-rm -f svnClientAdapter/lib/ganymed.jar
-ln -s %{_javadir}/ganymed-ssh2.jar svnClientAdapter/lib/ganymed.jar
-
-rm -f subclipse/core/lib/svnjavahl.jar
-ln -s %{javahl_dir}/svn-javahl.jar subclipse/core/lib/svnjavahl.jar
-rm -f subclipse/core/lib/svnClientAdapter.jar
-# svnClientAdapter.jar is copied after being built
-rm -f subclipse/core/lib/svnkit.jar
-ln -s %{_javadir}/svnkit.jar subclipse/core/lib/svnkit.jar
-rm -f subclipse/core/lib/ganymed.jar
-ln -s %{_javadir}/ganymed-ssh2.jar subclipse/core/lib/ganymed.jar
+
+# fixing wrong-file-end-of-line-encoding warnings
+sed -i 's/\r//' org.tigris.subversion.subclipse.graph/icons/readme.txt
%build
-# ---------------------------------
-# building svnClientAdapter
-pushd svnClientAdapter
-%{ant} svnClientAdapter.jar
-popd
-
-# copying svnClientAdapter inside subclipse module
-cp svnClientAdapter/build/lib/svnClientAdapter.jar subclipse/core/lib/svnClientAdapter.jar
-
-# ---------------------------------
-# building subclipse
-pushd subclipse
-
-%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.subclipse
-%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book
-
-# returning to base build directory
-popd
-
-# Link source files to fix -debuginfo generation.
-rm -rf subclipse/org
-mkdir -p subclipse/org/tigris/subversion
-ln -s $(pwd)/svnClientAdapter/src/main/org/tigris/subversion/svnclientadapter subclipse/org/tigris/subversion
-mkdir -p subclipse/org/tigris/subversion/subclipse
-ln -s $(pwd)/subclipse/core/src/org/tigris/subversion/subclipse/core subclipse/org/tigris/subversion/subclipse
-ln -s $(pwd)/subclipse/ui/src/org/tigris/subversion/subclipse/ui subclipse/org/tigris/subversion/subclipse
+%{eclipse_base}/buildscripts/pdebuild \
+ -f org.tigris.subversion.clientadapter.feature \
+ -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild \
+ -f org.tigris.subversion.clientadapter.javahl.feature \
+ -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild \
+ -f org.tigris.subversion.clientadapter.svnkit.feature \
+ -o `pwd`/orbitDeps \
+ -d svnkit
+%{eclipse_base}/buildscripts/pdebuild \
+ -f org.tigris.subversion.subclipse \
+ -o `pwd`/orbitDeps
+%{eclipse_base}/buildscripts/pdebuild \
+ -f org.tigris.subversion.subclipse.graph.feature \
+ -o `pwd`/orbitDeps \
+ -d gef
+
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
-installDir=$RPM_BUILD_ROOT%{install_loc}/subclipse
-install -d -m 755 $installDir
-install -d -m 755 ${installDir}-book
-pushd subclipse
-unzip -q -d $installDir build/rpmBuild/org.tigris.subversion.subclipse.zip
-unzip -q -d ${installDir}-book build/rpmBuild/org.tigris.subversion.book.zip
-popd
-
-# repacking core plugin as a directory based plugin, needed in order to replace some jars with symlinks
-mkdir $RPM_BUILD_ROOT%{core_plugin_dir}
-unzip -q -d $RPM_BUILD_ROOT%{core_plugin_dir} $RPM_BUILD_ROOT%{core_plugin_jar}
-rm $RPM_BUILD_ROOT%{core_plugin_jar}
-# packaging .class files as a jar file
-jar -cf $RPM_BUILD_ROOT%{core_plugin_dir}/lib/subclipse-core.jar -C $RPM_BUILD_ROOT%{core_plugin_dir} org
-rm -rf $RPM_BUILD_ROOT%{core_plugin_dir}/org
-
-# removing core plugin internal jars
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
-rm -f $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
-
-%if %{gcj_support}
- aot-compile-rpm
-%endif
-
-# We need to setup the symlink because the ant copy task doesn't preserve symlinks
-# TODO file a bug about this
-ln -s %{javahl_dir}/svn-javahl.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnjavahl.jar
-ln -s %{_javadir}/svnkit.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/svnkit.jar
-ln -s %{_javadir}/ganymed-ssh2.jar $RPM_BUILD_ROOT%{core_plugin_dir}/lib/ganymed.jar
+installBase=$RPM_BUILD_ROOT%{install_loc}
+install -d -m 755 $installBase
+
+install -d -m 755 $installBase/subclipse-clientadapter
+unzip -q -d $installBase/subclipse-clientadapter build/rpmBuild/org.tigris.subversion.clientadapter.feature.zip
+install -d -m 755 $installBase/subclipse-clientadapter-javahl
+unzip -q -d $installBase/subclipse-clientadapter-javahl build/rpmBuild/org.tigris.subversion.clientadapter.javahl.feature.zip
+install -d -m 755 $installBase/subclipse-clientadapter-svnkit
+unzip -q -d $installBase/subclipse-clientadapter-svnkit build/rpmBuild/org.tigris.subversion.clientadapter.svnkit.feature.zip
+install -d -m 755 $installBase/subclipse
+unzip -q -d $installBase/subclipse build/rpmBuild/org.tigris.subversion.subclipse.zip
+install -d -m 755 $installBase/subclipse-graph
+unzip -q -d $installBase/subclipse-graph build/rpmBuild/org.tigris.subversion.subclipse.graph.feature.zip
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
-%post -p %{_bindir}/rebuild-gcj-db
-%postun -p %{_bindir}/rebuild-gcj-db
-%endif
%files
%defattr(-,root,root)
%{install_loc}/subclipse
-%doc svnClientAdapter/readme.txt svnClientAdapter/changelog.txt svnClientAdapter/license.txt
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{install_loc}/subclipse-clientadapter*
+%doc org.tigris.subversion.subclipse.graph/icons/readme.txt
+
-%files book
+%files graph
%defattr(-,root,root)
-%{install_loc}/subclipse-book
+%{install_loc}/subclipse-graph
+
%changelog
+* Tue Feb 24 2009 Robert Marcano <robert at marcanoonline.com> 1.4.7-1
+- Update to upstream 1.4.7
+- eclipse-subclipse-book is obsoleted, not provided upstream
+- New eclipse-subclipse-graph subpackage
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Sep 2007 15:18:16 -0000 1.6
+++ sources 24 Feb 2009 16:11:36 -0000 1.7
@@ -1 +1 @@
-3cc35428541a456db2614ce9b027fe8e subclipse-1.2.4.tgz
+c0faddf79339cf86b757a8679c7f592d subclipse-1.4.7.tgz
--- eclipse-subclipse-1.2.2-default-svnkit.patch DELETED ---
--- eclipse-subclipse-1.2.4-plugin-classpath.patch DELETED ---
--- subclipse-fetch-1.2.4.sh DELETED ---
More information about the fedora-extras-commits
mailing list