Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 46

aMule.changes Changed

aMule.spec Changed

@@ -1,49 +1,81 @@
-Name:		aMule
-Summary:	Another eMule file-sharing program
-Version:       2.3.2+git20161207.1524
-Release:	0
-License:	GPL-2.0+
-Group:		Productivity/Networking/Other
-URL:		http://www.amule.org
-Source:		aMule.tar.xz
-Patch:		0001-Fix-desktop-files.patch
-# git diff 20f3a3b..origin/master | xz -e -9 > update.diff.xz
-Patch1:         update.diff.xz
+#
+# spec file for package aMule
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           aMule
+Version:        2.3.2+git.20161207
+Release:        0
+Summary:        Another eMule file-sharing program
+License:        GPL-2.0+
+Group:          Productivity/Networking/Other
+Url:            http://www.amule.org
+Source:         %{name}-%{version}.tar.xz
+Patch0:         0001-Fix-desktop-files.patch
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.9
 BuildRequires:  binutils-devel
-BuildRequires:	libkde4-devel
-BuildRequires:	libqt4-devel
-BuildRequires:	gcc-c++
-BuildRequires:  pkgconfig(gdlib)
-BuildRequires:  pkgconfig(libpng)
 BuildRequires:  fdupes
-BuildRequires:  libupnp-devel libcryptopp-devel libGeoIP-devel update-desktop-files
+BuildRequires:  gcc-c++
+BuildRequires:  libkde4-devel
 BuildRequires:  mozilla-nspr
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
 BuildRequires:  wxWidgets-3_0-devel
-Requires:	GeoIP
+BuildRequires:  pkgconfig(Qt3Support)
+BuildRequires:  pkgconfig(QtCLucene)
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtDBus)
+BuildRequires:  pkgconfig(QtDeclarative)
+BuildRequires:  pkgconfig(QtDesigner)
+BuildRequires:  pkgconfig(QtDesignerComponents)
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtHelp)
+BuildRequires:  pkgconfig(QtMultimedia)
+BuildRequires:  pkgconfig(QtNetwork)
+BuildRequires:  pkgconfig(QtOpenGL)
+BuildRequires:  pkgconfig(QtScript)
+BuildRequires:  pkgconfig(QtScriptTools)
+BuildRequires:  pkgconfig(QtSql)
+BuildRequires:  pkgconfig(QtSvg)
+BuildRequires:  pkgconfig(QtTest)
+BuildRequires:  pkgconfig(QtUiTools)
+BuildRequires:  pkgconfig(QtXml)
+BuildRequires:  pkgconfig(QtXmlPatterns)
+BuildRequires:  pkgconfig(cryptopp)
+BuildRequires:  pkgconfig(gdlib)
+BuildRequires:  pkgconfig(geoip)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libupnp)
+Requires:       GeoIP
 
 %description
 aMule stand for another eMule file-sharing program, it is also
-another fork of the xMule (former lMule) project. It connects 
+another fork of the xMule (former lMule) project. It connects
 to eDonkey2000 network, supports Linux, *BSD platforms, and has
 a new vision of the GUI.
 
-###
-# Think about splitting up the packages: amulegui, amuled...
-###
 %package kde4
-Summary:	Plasma widget for aMule
+Summary:        Plasma widget for aMule
 Requires:       %{name} = %{version}
 
 %description kde4
 This package contains the plasma widget for aMule.
 
-
 %prep
-%setup -q -n %{name}
-%patch -p1
-%patch1 -p1
+%setup -q
+%patch0 -p1
 
 %build
 ./autogen.sh
@@ -76,9 +108,9 @@
 %make_install docdir=%{_defaultdocdir}/aMule
 
 %suse_update_desktop_file -G "P2P Client" -i amule Network P2P
-%suse_update_desktop_file  %buildroot/%_datadir/applications/alc.desktop
-%suse_update_desktop_file  %buildroot/%_datadir/applications/amulegui.desktop
-%suse_update_desktop_file  %buildroot/%_datadir/applications/wxcas.desktop
+%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/alc.desktop
+%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/amulegui.desktop
+%suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/wxcas.desktop
 
 #tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/amule/
 #mv %{buildroot}%{_datadir}/amule/amule__icon.png %{buildroot}%{_datadir}/pixmaps/amule.png
@@ -92,12 +124,12 @@
 
 %find_lang amule
 
-%fdupes -s %buildroot
+%fdupes -s %{buildroot}
 
 %files -f amule.lang
 %defattr(-,root,root)
 %doc docs/AUTHORS docs/Changelog docs/README docs/license.txt
-%doc %{_mandir}/*/*
+%{_mandir}/*/*
 %{_bindir}/*
 %{_libdir}/xchat/plugins/xas.pl
 %{_datadir}/amule/*

update.diff.xz Deleted

@@ -1,85459 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 70f9a5086..b6676c998 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -451,7 +451,7 @@ dnl End of checks, now write the results and report
- dnl ---------------------------------------------------------------------------
- 
- AM_CONDITIONAL(SYS_WIN32, test x$SYS = xwin32)
--AM_CONDITIONAL(NEED_RC, test x$SYS = xwin32 -a "$RC" != ":")
-+AM_CONDITIONAL(NEED_RC, test x$SYS = xwin32 -a "$RC" != ":" -a x$WX_PORT = xmsw)
- AM_CONDITIONAL(NEED_CORESERVICES, test x$SYS = xdarwin)
- AM_CONDITIONAL(COMPILE_NLS, test x$USE_NLS = xyes)
- AM_CONDITIONAL(GENERATE_FLEX_HEADER, test x$HAVE_FLEX_EXTENDED = xyes)
-diff --git a/docs/Changelog b/docs/Changelog
-index 7dbff70b2..7b2972300 100644
---- a/docs/Changelog
-+++ b/docs/Changelog
-@@ -1,9 +1,32 @@
--Version 2.4.0 - The river knows.
-+Version 2.3.3 - The "what do you want?" version.
- ----------
- 201?-??-??
- 
-+	gaffatape:
-+		* Workaround for bug in wxWidgets causing aMule to crash on
-+		  closing the last search tab
-+
- 	GonoszTopi:
- 		* Fix restoring toolbar orientation on 'Cancel'
-+		* Features ported from eMule:
-+			- Find best keyword for Kad search (0.49c)
-+		* Various fixes to gdlib detection
-+		* Support for compiling aMule with wxGTK under Cygwin
-+		* Various small fixes to the MacOSX packager script
-+		* Workaround for wxWidgets bug #17740 (Wrong path used to
-+		  search for translations), fixes GitHub issue #74 (.mo files
-+		  for translation are not loaded if amule is built to install
-+		  to a prefix other than /usr (e.g. /usr/local).)
-+
-+	persmule:
-+		* Fix sharing directories with non-ASCII names with aMule daemon
-+		* Fix potential invalid detection for empty wxCharBuffer
-+
-+	scow:
-+		* C++11 fixes
-+
-+	Vollstrecker:
-+		* Initial support for detecting pkg-config based gdlib versions
- 
- --------------------------------------------------------------------------------
- 
-diff --git a/m4/gdlib.m4 b/m4/gdlib.m4
-index 236da4b2e..6b81b2d53 100644
---- a/m4/gdlib.m4
-+++ b/m4/gdlib.m4
-@@ -34,7 +34,8 @@ dnl to use. Set GDLIB_CONFIG_PATH to specify the full path to gdlib-config -
- dnl in this case the macro won't even waste time on tests for its existence.
- dnl ---------------------------------------------------------------------------
- AC_DEFUN([MULE_CHECK_GDLIB],
--[dnl
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+
- m4_define([REQUIRED_VERSION], [m4_ifval([$1], [$1], [2.0.0])])dnl
- m4_define([REQUIRED_VERSION_MAJOR], [m4_bregexp(REQUIRED_VERSION, [$[0-9]+$\.$[0-9]+$\.$[0-9]+$], [\1])])dnl
- m4_define([REQUIRED_VERSION_MINOR], [m4_bregexp(REQUIRED_VERSION, [$[0-9]+$\.$[0-9]+$\.$[0-9]+$], [\2])])dnl
-@@ -45,39 +46,67 @@ m4_define([REQUIRED_VERSION_MICRO], [m4_bregexp(REQUIRED_VERSION, [$[0-9]+$\.\
- 
- 	GDLIB_VERSION=
- 
--	# do we have gdlib-config name: it can be gdlib-config or gd-config or ...
--	AS_IF([test x${GDLIB_CONFIG_NAME+set} != xset], [GDLIB_CONFIG_NAME=gdlib-config])
--	AS_IF([test -n "$with_gdlib_config"], [GDLIB_CONFIG_NAME="$with_gdlib_config"])
--
--	# deal with optional prefix
--	AS_IF([test -n "$with_gdlib_prefix"], [GDLIB_LOOKUP_PATH="$with_gdlib_prefix/bin"])
--
--	# don't search the PATH if GDLIB_CONFIG_NAME is absolute filename
--	AS_IF([test -x "$GDLIB_CONFIG_NAME"], [
--		AC_MSG_CHECKING([for gdlib-config])
--		GDLIB_CONFIG_PATH="$GDLIB_CONFIG_NAME"
--		AC_MSG_RESULT([$GDLIB_CONFIG_PATH])
--	], [AC_PATH_PROG([GDLIB_CONFIG_PATH], [$GDLIB_CONFIG_NAME], [no], [$GDLIB_LOOKUP_PATH:$PATH])])
--
--	AS_IF([test ${GDLIB_CONFIG_PATH:-no} != no],
--	[
--		AC_MSG_CHECKING([for gdlib version >= REQUIRED_VERSION])
--		GDLIB_CONFIG_WITH_ARGS="$GDLIB_CONFIG_PATH $gdlib_config_args"
--
--		GDLIB_VERSION=`$GDLIB_CONFIG_WITH_ARGS --version`
--		gdlib_config_major_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\1/']`
--		gdlib_config_minor_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\2/']`
--		gdlib_config_micro_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\3/']`
--
--		gdlib_ver_ok=
--		MULE_IF([test $gdlib_config_major_version -gt REQUIRED_VERSION_MAJOR], [gdlib_ver_ok=yes],
--			[test $gdlib_config_major_version -eq REQUIRED_VERSION_MAJOR], [
--				MULE_IF([test $gdlib_config_minor_version -gt REQUIRED_VERSION_MINOR], [gdlib_ver_ok=yes],
--					[test $gdlib_config_minor_version -eq REQUIRED_VERSION_MINOR],
--						[MULE_IF([test $gdlib_config_micro_version -ge REQUIRED_VERSION_MICRO], [gdlib_ver_ok=yes])])
-+	# Check gdlib in pkg-config first to avoid deprecation warnings
-+	# If --with-gdlib-config or --with-gdlib-prefix was given, then
-+	# skip the pkg-config check, the user probably wants to use
-+	# another gdlib instance.
-+	AS_IF([test -z "${with_gdlib_config:-}${with_gdlib_prefix:-}"], [
-+		AS_IF([test -n "$PKG_CONFIG"], [
-+			AC_MSG_CHECKING([for gdlib])
-+
-+			AS_IF([$PKG_CONFIG gdlib --exists], [
-+				GDLIB_VERSION=`$PKG_CONFIG gdlib --modversion`
-+
-+				AS_IF([$PKG_CONFIG gdlib --atleast-version=REQUIRED_VERSION], [
-+					AC_MSG_RESULT([yes (version $GDLIB_VERSION)])
-+					GDLIB_CFLAGS=`$PKG_CONFIG gdlib --cflags`
-+					GDLIB_LDFLAGS=`$PKG_CONFIG gdlib --libs-only-L`
-+					GDLIB_LIBS=`$PKG_CONFIG gdlib --libs-only-other`
-+					GDLIB_LIBS="$GDLIB_LIBS `$PKG_CONFIG gdlib --libs-only-l`"
-+				], [
-+					AC_MSG_RESULT([no (version $GDLIB_VERSION is not new enough)])
-+					GDLIB_VERSION=
-+				])
-+			], [
-+				AC_MSG_RESULT([no])
- 			])
-+		])
-+	])
-+
-+	# Try gdlib-config if we did not find a sufficient gdlib version in pkg-config
-+	AS_IF([test -z "$GDLIB_VERSION"], [
-+		# do we have gdlib-config name: it can be gdlib-config or gd-config or ...
-+		AS_IF([test x${GDLIB_CONFIG_NAME+set} != xset], [GDLIB_CONFIG_NAME=gdlib-config])
-+		AS_IF([test -n "$with_gdlib_config"], [GDLIB_CONFIG_NAME="$with_gdlib_config"])
-+
-+		# deal with optional prefix
-+		AS_IF([test -n "$with_gdlib_prefix"], [GDLIB_LOOKUP_PATH="$with_gdlib_prefix/bin"])
-+
-+		# don't search the PATH if GDLIB_CONFIG_NAME is absolute filename
-+		AS_IF([test -x "$GDLIB_CONFIG_NAME"], [
-+			AC_MSG_CHECKING([for gdlib-config])
-+			GDLIB_CONFIG_PATH="$GDLIB_CONFIG_NAME"
-+			AC_MSG_RESULT([$GDLIB_CONFIG_PATH])
-+		], [AC_PATH_PROG([GDLIB_CONFIG_PATH], [$GDLIB_CONFIG_NAME], [no], [$GDLIB_LOOKUP_PATH:$PATH])])
-+
-+		AS_IF([test ${GDLIB_CONFIG_PATH:-no} != no], [
-+			AC_MSG_CHECKING([for gdlib version >= REQUIRED_VERSION])
-+			GDLIB_CONFIG_WITH_ARGS="$GDLIB_CONFIG_PATH $gdlib_config_args"
-+
-+			GDLIB_VERSION=`$GDLIB_CONFIG_WITH_ARGS --version`
-+			gdlib_config_major_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\1/']`
-+			gdlib_config_minor_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\2/']`
-+			gdlib_config_micro_version=`echo $GDLIB_VERSION | sed ['s/$[0-9]*$\.$[0-9]*$\.$[0-9]*$.*/\3/']`
- 
--		AS_IF([test -z "$gdlib_ver_ok"], [
-+			MULE_IF([test $gdlib_config_major_version -gt REQUIRED_VERSION_MAJOR], [gdlib_ver_ok=yes],
-+				[test $gdlib_config_major_version -eq REQUIRED_VERSION_MAJOR], [
-+					MULE_IF([test $gdlib_config_minor_version -gt REQUIRED_VERSION_MINOR], [gdlib_ver_ok=yes],
-+						[test $gdlib_config_minor_version -eq REQUIRED_VERSION_MINOR],
-+							[MULE_IF([test $gdlib_config_micro_version -ge REQUIRED_VERSION_MICRO], [gdlib_ver_ok=yes])])
-+				])
-+		])
-+
-+		AS_IF([test -z "${gdlib_ver_ok:-}"], [
- 			AS_IF([test -z "$GDLIB_VERSION"], [AC_MSG_RESULT([no])], [
- 				AC_MSG_RESULT([no (version $GDLIB_VERSION is not new enough)])
- 				GDLIB_VERSION=
-@@ -87,18 +116,23 @@ m4_define([REQUIRED_VERSION_MICRO], [m4_bregexp(REQUIRED_VERSION, [$[0-9]+$\.\
- 			GDLIB_CFLAGS="`$GDLIB_CONFIG_WITH_ARGS --cflags`"
- 			GDLIB_LDFLAGS="`$GDLIB_CONFIG_WITH_ARGS --ldflags`"
- 			GDLIB_LIBS="`$GDLIB_CONFIG_WITH_ARGS --libs`"
--			MULE_BACKUP([CFLAGS])
--			MULE_APPEND([CFLAGS], [$GDLIB_CFLAGS])
--			AC_CHECK_HEADER([gd.h],, [
--				GDLIB_CFLAGS=
--				GDLIB_LDFLAGS=
--				GDLIB_LIBS=
--				GDLIB_VERSION=
--			])
--			MULE_RESTORE([CFLAGS])
- 		])
- 	])
- 
-+	AS_IF([test -n "$GDLIB_VERSION"], [
-+		MULE_BACKUP([CFLAGS])
-+		MULE_APPEND([CFLAGS], [$GDLIB_CFLAGS])
-+
-+		AC_CHECK_HEADER([gd.h],, [
-+			GDLIB_CFLAGS=
-+			GDLIB_LDFLAGS=
-+			GDLIB_LIBS=
-+			GDLIB_VERSION=
-+		])
-+
-+		MULE_RESTORE([CFLAGS])
-+	])
-+
- 	AS_IF([test -n "$GDLIB_VERSION"], [$2], [$3])
- 
- AC_SUBST([GDLIB_CFLAGS])dnl
-diff --git a/po/amule.pot b/po/amule.pot
-index d5b2d417f..3b1c1b3c3 100644

aMule-2.3.2+git.20161207.tar.xz Added

aMule.tar.xz Deleted