rpms/eclipse-collabnet-merge/F-12 get-collabnet-merge.sh, NONE, 1.1 eclipse-collabnet-merge.spec, NONE, 1.1 sources, 1.1, 1.2 .cvsignore, 1.1, 1.2

mbooth mbooth at fedoraproject.org
Thu Feb 11 13:02:31 UTC 2010


Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-collabnet-merge/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7738/eclipse-collabnet-merge/F-12

Modified Files:
	sources .cvsignore 
Added Files:
	get-collabnet-merge.sh eclipse-collabnet-merge.spec 
Log Message:
Import initial release of a CollabNet Merge Client package.


--- NEW FILE get-collabnet-merge.sh ---
#!/bin/bash
NAME="collabnet-merge"
VERSION=1.10.0
REV="807"

echo "Exporting from Source Control..."
rm -rf $NAME-$VERSION
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null

# if prompted for a password, just hit return; the password is blank
svn export http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/branches/1.10.x/features/com.collabnet.subversion.merge.feature@$REV --username guest
svn export http://desktop-eclipse.open.collab.net/svn/desktop-eclipse/branches/1.10.x/plugins/com.collabnet.subversion.merge@$REV --username guest

popd >/dev/null

echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION


--- NEW FILE eclipse-collabnet-merge.spec ---
%global eclipse_base     %{_libdir}/eclipse
%global eclipse_dropin   %{_datadir}/eclipse/dropins

Name:      eclipse-collabnet-merge
Version:   1.10.0
Release:   1%{?dist}
Summary:   CollabNet Merge Client for Subclipse
Group:     Development/Tools
License:   EPL
URL:       http://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&freeformpage=Merge%20Client

# source tarball and the script used to generate it from upstream's source control
# script usage:
# $ sh get-collabnet-merge.sh
Source0:   collabnet-merge-%{version}.tar.gz
Source1:   get-collabnet-merge.sh

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:     noarch

BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: eclipse-pde >= 1:3.5.0
BuildRequires: eclipse-subclipse >= 1.6.5
Requires:      java
Requires:      jpackage-utils
Requires:      eclipse-platform >= 1:3.5.0
Requires:      eclipse-subclipse >= 1.6.5

%description
The CollabNet Merge Client has been built on top of Eclipse and Subclipse.
This combination allowed us to support multiple client operating systems and
also allowed us to focus on the actual merge client and merge process while
leveraging the excellent Subversion capabilities that already exist in
Subclipse. This gives you a powerful client that allows you to perform all
Subversion operations from a single tool. Commit, History, Blame, Switch,
Tagging. Everything you need is available. You do not have to be an Eclipse
shop or even an Eclipse developer to use the client. Eclipse and Subclipse
make it easy to checkout and access any project in your repository. You can
just use the client as a general Subversion UI, or even just to perform merges.
Adopting the client does not require that you adopt Eclipse as your only
development tool.

%prep
%setup -q -n collabnet-merge-%{version}

# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
for j in `find -name "*.jar"`; do
  if [ ! -L $j ]; then
    JARS="$JARS $j"
  fi
done
if [ ! -z "$JARS" ]; then
   echo "These jars should be deleted and symlinked to system jars: $JARS"
   exit 1
fi

%build
# build collabnet-merge features
%{eclipse_base}/buildscripts/pdebuild -f com.collabnet.subversion.merge.feature \
  -d "subclipse svnkit"

%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -n -d %{buildroot}%{eclipse_dropin}/collabnet-merge build/rpmBuild/com.collabnet.subversion.merge.feature.zip

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{eclipse_dropin}/collabnet-merge
%doc com.collabnet.subversion.merge.feature/license.html

%changelog
* Wed Feb 03 2010 Mat Booth <fedora at matbooth.co.uk> 1.10.0-1
- Initial revision of CollabNet Merge Client package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-collabnet-merge/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	11 Feb 2010 06:26:43 -0000	1.1
+++ sources	11 Feb 2010 13:02:31 -0000	1.2
@@ -0,0 +1 @@
+14713ece46467760e7c78ed757efba3b  collabnet-merge-1.10.0.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-collabnet-merge/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	11 Feb 2010 06:26:42 -0000	1.1
+++ .cvsignore	11 Feb 2010 13:02:31 -0000	1.2
@@ -0,0 +1 @@
+collabnet-merge-1.10.0.tar.gz



More information about the scm-commits mailing list