[azureus] - Remove libgconf-java false BR/R. - Use global instead of define.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Aug 25 12:41:41 UTC 2010


commit 1719a8f0112a4a0aab3b0fa56272d6326fc9fa8d
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Aug 25 15:39:52 2010 +0300

    - Remove libgconf-java false BR/R.
    - Use global instead of define.

 azureus.script |    2 +-
 azureus.spec   |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/azureus.script b/azureus.script
old mode 100755
new mode 100644
index 5fe3c37..2a6ca46
--- a/azureus.script
+++ b/azureus.script
@@ -32,4 +32,4 @@ case $(uname -i) in
 		LIBDIR=/usr/lib
                 ;;
 esac
-MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LIBDIR/eclipse/plugins/:$LIBDIR/eclipse/:$LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
+MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LIBDIR/eclipse/plugins/:$LIBDIR/eclipse/:$LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
diff --git a/azureus.spec b/azureus.spec
index c3747f0..4fb5749 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -1,8 +1,8 @@
-%define		_newname Vuze
+%global		_newname Vuze
 
 Name:		azureus
 Version:	4.5.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -50,14 +50,12 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ant, jpackage-utils >= 1.5, xml-commons-apis
 BuildRequires:	jakarta-commons-cli, log4j
-BuildRequires:	libgconf-java
 BuildRequires:	bouncycastle >= 1.33-3
 BuildRequires:	eclipse-swt >= 3.5
 BuildRequires:	junit
 Requires:	jakarta-commons-cli, log4j
 Requires:	xulrunner
 Requires:	eclipse-swt >= 3.5
-Requires:	libgconf-java
 Requires:	 bouncycastle >= 1.33-3
 Requires:	 java >= 1:1.6.0
 BuildRequires:	 java-devel >= 1:1.6.0
@@ -148,7 +146,7 @@ chmod 644 *.txt
 %build
 mkdir -p build/libs
 build-jar-repository -p build/libs bcprov jakarta-commons-cli log4j \
-  gtk2.8 glib0.2 junit
+  junit
 
 #ppc seems to have eclipse-swt.ppc64 installed so libdir can't be used
 if [ -e /usr/lib/eclipse/swt.jar ];then
@@ -248,6 +246,10 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Wed Aug 25 2010 Alexander Kurtakov <akurtako at redhat.com> 4.5.0.2-2
+- Remove libgconf-java false BR/R.
+- Use global instead of define.
+
 * Wed Aug 18 2010 David Juran <david at juran.se> - 4.5.0.2-1
 - upgrade to 4.5.0.2
 


More information about the scm-commits mailing list