Request 4618 (accepted)

Overview

Request 4618 (accepted)

Remove qt4 and kde4 from build to fix Tumbleweed build.

Created by davepl about 5 years ago
In state accepted
Package maintainer: gcomes.pmbs

Submit aMule

Submit package home:davepl / aMule to package Extra / aMule

aMule.changes Changed

aMule.spec Changed

@@ -21,49 +21,24 @@
 License:        GPL-2.0+
 Group:          Productivity/Networking/Other
 Url:            http://www.amule.org
+#https://github.com/amule-project/amule
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  autoconf
 BuildRequires:  automake >= 1.9
 BuildRequires:  binutils-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libkde4-devel
 BuildRequires:  mozilla-nspr
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-%if 1
-BuildRequires:  wxWidgets-devel >= 3
-%else
-BuildRequires:  wxWidgets-wxcontainer-devel < 3
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
-%endif
-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:  wxWidgets-3_0-nostl-devel
 BuildRequires:  pkgconfig(cryptopp)
 BuildRequires:  pkgconfig(gdlib)
 BuildRequires:  pkgconfig(geoip)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libupnp)
 Requires:       GeoIP
+Conflicts:      aMule-kde4
 
 %description
 aMule stand for another eMule file-sharing program, it is also
@@ -71,13 +46,6 @@
 to eDonkey2000 network, supports Linux, *BSD platforms, and has
 a new vision of the GUI.
 
-%package kde4
-Summary:        Plasma widget for aMule
-Requires:       %{name} = %{version}
-
-%description kde4
-This package contains the plasma widget for aMule.
-
 %prep
 %autosetup -p1
 
@@ -97,7 +65,6 @@
   --enable-alcc \
   --enable-xas \
   --enable-fileview \
-  --enable-plasmamule \
   --disable-static \
   --enable-upnp \
   --disable-debug \
@@ -106,7 +73,7 @@
   --disable-ccache \
   --enable-mmap
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 %make_install docdir=%{_defaultdocdir}/aMule.xxx
@@ -117,16 +84,12 @@
 %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
+#tar -xf %%{SOURCE1} -C %%{buildroot}%%{_datadir}/amule/
+#mv %%{buildroot}%%{_datadir}/amule/amule__icon.png %%{buildroot}%%{_datadir}/pixmaps/amule.png
 
 # Don't overwrite system locale.alias
 rm -f %{buildroot}%{_datadir}/locale/locale.alias
 
-# Move amule.xml to right place
-mkdir -p %{buildroot}%{_datadir}/mime/packages
-mv %{buildroot}%{_datadir}/mime/*.xml %{buildroot}%{_datadir}/mime/packages/
-
 %find_lang amule
 
 %fdupes -s %{buildroot}
@@ -152,13 +115,4 @@
 %exclude %{_bindir}/plasmamule-engine-feeder
 %exclude %{_datadir}/applications/plasmamule-engine-feeder.desktop
 
-%files kde4
-%defattr(-,root,root)
-%{_bindir}/plasmamule-engine-feeder
-%{_libdir}/kde4/*.so
-%{_datadir}/kde4/services/*
-%{_datadir}/applications/plasmamule-engine-feeder.desktop
-%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg
-%{_datadir}/mime/packages/amule.xml
-
 %changelog

Build Results
RPM Lint

Refresh

Comments for request 4618 0

Request History

davepl created request about 5 years ago

Remove qt4 and kde4 from build to fix Tumbleweed build.

jsjhb accepted request about 5 years ago