Overview

Request 4618 (accepted)

Remove qt4 and kde4 from build to fix Tumbleweed build.

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

aMule.changes Changed
x
 
1
@@ -1,4 +1,11 @@
2
 -------------------------------------------------------------------
3
+Wed Nov 13 09:38:03 UTC 2019 - Dave Plater <davejplater@gmail.com>
4
+
5
+- Use wxWidgets-nostl, this is maybe not needed but doesn't hurt.
6
+- Remove kde4 and qt4 elements to allow Tumbleweed build, see:
7
+  https://github.com/amule-project/amule/issues/110
8
+
9
+-------------------------------------------------------------------
10
 Sun Sep 22 17:53:50 UTC 2019 - olaf@aepfle.de
11
 
12
 - Update to version 2.3.2.20190827.2a1b09233
13
aMule.spec Changed
118
 
1
@@ -21,49 +21,24 @@
2
 License:        GPL-2.0+
3
 Group:          Productivity/Networking/Other
4
 Url:            http://www.amule.org
5
+#https://github.com/amule-project/amule
6
 Source:         %{name}-%{version}.tar.xz
7
 BuildRequires:  autoconf
8
 BuildRequires:  automake >= 1.9
9
 BuildRequires:  binutils-devel
10
 BuildRequires:  fdupes
11
 BuildRequires:  gcc-c++
12
-BuildRequires:  libkde4-devel
13
 BuildRequires:  mozilla-nspr
14
 BuildRequires:  pkgconfig
15
 BuildRequires:  update-desktop-files
16
-%if 1
17
-BuildRequires:  wxWidgets-devel >= 3
18
-%else
19
-BuildRequires:  wxWidgets-wxcontainer-devel < 3
20
-%define _use_internal_dependency_generator 0
21
-%define __find_requires %wx_requires
22
-%endif
23
-BuildRequires:  pkgconfig(Qt3Support)
24
-BuildRequires:  pkgconfig(QtCLucene)
25
-BuildRequires:  pkgconfig(QtCore)
26
-BuildRequires:  pkgconfig(QtDBus)
27
-BuildRequires:  pkgconfig(QtDeclarative)
28
-BuildRequires:  pkgconfig(QtDesigner)
29
-BuildRequires:  pkgconfig(QtDesignerComponents)
30
-BuildRequires:  pkgconfig(QtGui)
31
-BuildRequires:  pkgconfig(QtHelp)
32
-BuildRequires:  pkgconfig(QtMultimedia)
33
-BuildRequires:  pkgconfig(QtNetwork)
34
-BuildRequires:  pkgconfig(QtOpenGL)
35
-BuildRequires:  pkgconfig(QtScript)
36
-BuildRequires:  pkgconfig(QtScriptTools)
37
-BuildRequires:  pkgconfig(QtSql)
38
-BuildRequires:  pkgconfig(QtSvg)
39
-BuildRequires:  pkgconfig(QtTest)
40
-BuildRequires:  pkgconfig(QtUiTools)
41
-BuildRequires:  pkgconfig(QtXml)
42
-BuildRequires:  pkgconfig(QtXmlPatterns)
43
+BuildRequires:  wxWidgets-3_0-nostl-devel
44
 BuildRequires:  pkgconfig(cryptopp)
45
 BuildRequires:  pkgconfig(gdlib)
46
 BuildRequires:  pkgconfig(geoip)
47
 BuildRequires:  pkgconfig(libpng)
48
 BuildRequires:  pkgconfig(libupnp)
49
 Requires:       GeoIP
50
+Conflicts:      aMule-kde4
51
 
52
 %description
53
 aMule stand for another eMule file-sharing program, it is also
54
@@ -71,13 +46,6 @@
55
 to eDonkey2000 network, supports Linux, *BSD platforms, and has
56
 a new vision of the GUI.
57
 
58
-%package kde4
59
-Summary:        Plasma widget for aMule
60
-Requires:       %{name} = %{version}
61
-
62
-%description kde4
63
-This package contains the plasma widget for aMule.
64
-
65
 %prep
66
 %autosetup -p1
67
 
68
@@ -97,7 +65,6 @@
69
   --enable-alcc \
70
   --enable-xas \
71
   --enable-fileview \
72
-  --enable-plasmamule \
73
   --disable-static \
74
   --enable-upnp \
75
   --disable-debug \
76
@@ -106,7 +73,7 @@
77
   --disable-ccache \
78
   --enable-mmap
79
 
80
-make %{?_smp_mflags}
81
+make %{?_smp_mflags} V=1
82
 
83
 %install
84
 %make_install docdir=%{_defaultdocdir}/aMule.xxx
85
@@ -117,16 +84,12 @@
86
 %suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/amulegui.desktop
87
 %suse_update_desktop_file  %{buildroot}/%{_datadir}/applications/wxcas.desktop
88
 
89
-#tar -xf %{SOURCE1} -C %{buildroot}%{_datadir}/amule/
90
-#mv %{buildroot}%{_datadir}/amule/amule__icon.png %{buildroot}%{_datadir}/pixmaps/amule.png
91
+#tar -xf %%{SOURCE1} -C %%{buildroot}%%{_datadir}/amule/
92
+#mv %%{buildroot}%%{_datadir}/amule/amule__icon.png %%{buildroot}%%{_datadir}/pixmaps/amule.png
93
 
94
 # Don't overwrite system locale.alias
95
 rm -f %{buildroot}%{_datadir}/locale/locale.alias
96
 
97
-# Move amule.xml to right place
98
-mkdir -p %{buildroot}%{_datadir}/mime/packages
99
-mv %{buildroot}%{_datadir}/mime/*.xml %{buildroot}%{_datadir}/mime/packages/
100
-
101
 %find_lang amule
102
 
103
 %fdupes -s %{buildroot}
104
@@ -152,13 +115,4 @@
105
 %exclude %{_bindir}/plasmamule-engine-feeder
106
 %exclude %{_datadir}/applications/plasmamule-engine-feeder.desktop
107
 
108
-%files kde4
109
-%defattr(-,root,root)
110
-%{_bindir}/plasmamule-engine-feeder
111
-%{_libdir}/kde4/*.so
112
-%{_datadir}/kde4/services/*
113
-%{_datadir}/applications/plasmamule-engine-feeder.desktop
114
-%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg
115
-%{_datadir}/mime/packages/amule.xml
116
-
117
 %changelog
118
Refresh
Refresh
Request History
Dave Plater's avatar

davepl created request over 5 years ago

Remove qt4 and kde4 from build to fix Tumbleweed build.


Stefan Botter's avatar

jsjhb accepted request over 5 years ago

OK