Browse Source

RPM packaging: update kmplayer, kmyfirewall, kmymoney, knemo

pull/3/head
François Andriot 4 years ago
parent
commit
0ea5f09508
27 changed files with 450 additions and 2523 deletions
  1. 0
    1
      redhat/applications/basket/basket-14.0.0.spec
  2. 1
    4
      redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
  3. 13
    0
      redhat/applications/kmplayer/kmplayer-14.0.0.patch
  4. 129
    89
      redhat/applications/kmplayer/kmplayer-14.0.0.spec
  5. 0
    45
      redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch
  6. 0
    21
      redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch
  7. 0
    112
      redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch
  8. 0
    247
      redhat/applications/kmplayer/kmplayer-3.5.13.1.spec
  9. 0
    232
      redhat/applications/kmplayer/kmplayer-3.5.13.spec
  10. 126
    90
      redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec
  11. 0
    39
      redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch
  12. 0
    11
      redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch
  13. 0
    208
      redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec
  14. 0
    207
      redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec
  15. BIN
      redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz
  16. 119
    93
      redhat/applications/kmymoney/kmymoney-14.0.0.spec
  17. 0
    11
      redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch
  18. 0
    238
      redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
  19. 0
    22
      redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch
  20. 0
    264
      redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
  21. 0
    277
      redhat/applications/kmymoney/kmymoney-3.5.13.1.spec
  22. 0
    278
      redhat/applications/kmymoney/kmymoney-3.5.13.spec
  23. 0
    0
      redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff
  24. 0
    0
      redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch
  25. 0
    0
      redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch
  26. 0
    0
      redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch
  27. 62
    34
      redhat/applications/knemo/knemo-14.0.0.spec

+ 0
- 1
redhat/applications/basket/basket-14.0.0.spec View File

@@ -138,7 +138,6 @@ export PATH="%{tde_bindir}:${PATH}"
138 138
 %suse_update_desktop_file -G "Extended Clipboard" basket DesktopUtility
139 139
 %endif
140 140
 
141
-
142 141
 # Apps that should stay in TDE
143 142
 echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
144 143
 

+ 1
- 4
redhat/applications/klcddimmer/klcddimmer-14.0.0.spec View File

@@ -75,10 +75,7 @@ BuildRequires:	brp-check-trinity
75 75
 
76 76
 
77 77
 %description
78
-KKBSwitch displays an icon in the system tray that indicates which 
79
-layout is  KLcdDimmer is applet for simple adjust LCD brightness.
80
-Notice that this applet relies on an external program to get/set the 
81
-brightness.
78
+
82 79
 
83 80
 
84 81
 ##########

+ 13
- 0
redhat/applications/kmplayer/kmplayer-14.0.0.patch View File

@@ -0,0 +1,13 @@
1
+diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
2
+index c4bf580..0585ac9 100644
3
+--- a/src/gstplayer.cpp
4
++++ b/src/gstplayer.cpp
5
+@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) {
6
+ void KGStreamerPlayer::volume (int val) {
7
+     //fprintf (stderr, "position %d\n", val);
8
+     if (gst_elm_play)
9
+-        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L);
10
++        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL);
11
+ }
12
+ 
13
+ void KGStreamerPlayer::updatePosition () {

+ 129
- 89
redhat/applications/kmplayer/kmplayer-14.0.0.spec View File

@@ -1,52 +1,80 @@
1
-# Default version for this component
2
-%define tde_pkg kmplayer
1
+#
2
+# spec file for package kmplayer (version R14.0.0)
3
+#
4
+# Copyright (c) 2014 Trinity Desktop Environment
5
+#
6
+# All modifications and additions to the file contributed by third parties
7
+# remain the property of their copyright owners, unless otherwise agreed
8
+# upon. The license for this file, and modifications and additions to the
9
+# file, is the same license as for the pristine package itself (unless the
10
+# license for the pristine package is not an Open Source License, in which
11
+# case the license is the MIT License). An "Open Source License" is a
12
+# license that conforms to the Open Source Definition (Version 1.9)
13
+# published by the Open Source Initiative.
14
+#
15
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
16
+#
17
+
18
+# TDE variables
19
+%define tde_epoch 2
3 20
 %define tde_version 14.0.0
4
-
5
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
-%if "%{?tde_prefix}" != "/usr"
7
-%define _variant .opt
8
-%endif
9
-
10
-# TDE specific building variables
21
+%define tde_pkg kmplayer
22
+%define tde_prefix /opt/trinity
11 23
 %define tde_bindir %{tde_prefix}/bin
12 24
 %define tde_datadir %{tde_prefix}/share
13 25
 %define tde_docdir %{tde_datadir}/doc
14 26
 %define tde_includedir %{tde_prefix}/include
15 27
 %define tde_libdir %{tde_prefix}/%{_lib}
16 28
 %define tde_mandir %{tde_datadir}/man
17
-%define tde_appdir %{tde_datadir}/applications
18
-
19
-%define tde_tdeappdir %{tde_appdir}/tde
29
+%define tde_tdeappdir %{tde_datadir}/applications/tde
20 30
 %define tde_tdedocdir %{tde_docdir}/tde
21 31
 %define tde_tdeincludedir %{tde_includedir}/tde
22 32
 %define tde_tdelibdir %{tde_libdir}/trinity
23 33
 
24
-%define _docdir %{tde_docdir}
25
-
26 34
 
27
-Name:			trinity-%{tde_pkg}
28
-Summary:		media player for Trinity
29
-Version:		0.10.0c
30
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
35
+Name:		trinity-%{tde_pkg}
36
+Epoch:		%{tde_epoch}
37
+Version:	0.10.0c
38
+Release:	%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
39
+Summary:	Media player for Trinity
40
+Group:		Applications/Multimedia
41
+URL:		http://www.trinitydesktop.org/
42
+#URL:		http://kmplayer.kde.org
31 43
 
32
-License:		GPLv2+
33
-Group:			Applications/Multimedia
44
+%if 0%{?suse_version}
45
+License:	GPL-2.0+
46
+%else
47
+License:	GPLv2+
48
+%endif
34 49
 
35
-Vendor:			Trinity Project
36
-Packager:		Francois Andriot <francois.andriot@free.fr>
37
-URL:			http://kmplayer.kde.org
50
+#Vendor:		Trinity Desktop
51
+#Packager:	Francois Andriot <francois.andriot@free.fr>
38 52
 
39
-Prefix:			%{tde_prefix}
40
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
53
+Prefix:		%{tde_prefix}
54
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41 55
 
42 56
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
57
+Patch0:			%{tde_pkg}-%{tde_version}.patch
43 58
 
44
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
46 59
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47 60
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48 61
 BuildRequires:	desktop-file-utils
49 62
 
63
+BuildRequires:	autoconf automake libtool m4
64
+BuildRequires:	gcc-c++
65
+BuildRequires:	pkgconfig
66
+BuildRequires:	libtool
67
+
68
+# SUSE desktop files utility
69
+%if 0%{?suse_version}
70
+BuildRequires:	update-desktop-files
71
+%endif
72
+
73
+%if 0%{?opensuse_bs} && 0%{?suse_version}
74
+# for xdg-menu script
75
+BuildRequires:	brp-check-trinity
76
+%endif
77
+
50 78
 # DBUS support
51 79
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
52 80
 BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
@@ -119,6 +147,7 @@ BuildRequires:	dbus-glib-devel
119 147
 
120 148
 Requires:		%{name}-base = %{version}-%{release}
121 149
 
150
+
122 151
 %description
123 152
 A basic audio/video viewer application for Trinity.
124 153
 
@@ -135,6 +164,30 @@ KMPlayer can:
135 164
 * Lots of configurable shortcuts. Highly recommended for the VDR keys
136 165
   (if you have VDR) and volume increase/decrease
137 166
 
167
+%post
168
+/sbin/ldconfig || :
169
+
170
+%postun
171
+/sbin/ldconfig || :
172
+
173
+%files -f %{tde_pkg}.lang
174
+%defattr(-,root,root,-)
175
+%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
176
+%{tde_bindir}/kmplayer
177
+%{tde_bindir}/knpplayer
178
+%{tde_bindir}/kxvplayer
179
+%{tde_libdir}/libtdeinit_kmplayer.la
180
+%{tde_libdir}/libtdeinit_kmplayer.so
181
+%{tde_tdelibdir}/kmplayer.la
182
+%{tde_tdelibdir}/kmplayer.so
183
+%{tde_tdeappdir}/kmplayer.desktop
184
+%exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
185
+%exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
186
+%exclude %{tde_datadir}/apps/kmplayer/noise.gif
187
+%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
188
+%{tde_datadir}/apps/kmplayer/
189
+
190
+##########
138 191
 
139 192
 %package base
140 193
 Group:			Applications/Multimedia
@@ -143,11 +196,36 @@ Summary:		Base files for KMPlayer [Trinity]
143 196
 %description base
144 197
 Core files needed for KMPlayer.
145 198
 
199
+%post base
200
+touch --no-create %{tde_datadir}/icons/hicolor || :
201
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
202
+/sbin/ldconfig || :
203
+
204
+%postun base
205
+touch --no-create %{tde_datadir}/icons/hicolor || :
206
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
207
+/sbin/ldconfig || :
208
+
209
+%files base
210
+%defattr(-,root,root,-)
211
+%{tde_libdir}/libkmplayercommon.la
212
+%{tde_libdir}/libkmplayercommon.so
213
+%{tde_bindir}/kgstplayer
214
+%{tde_bindir}/kxineplayer
215
+%{tde_datadir}/config/kmplayerrc
216
+%{tde_datadir}/apps/kmplayer/bookmarks.xml
217
+%{tde_datadir}/apps/kmplayer/noise.gif
218
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
219
+%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
220
+%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
221
+%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
222
+
223
+##########
146 224
 
147 225
 %package konq-plugins
148 226
 Group:			Applications/Multimedia
149 227
 Requires:		%{name}-base = %{version}-%{release}
150
-Requires:		trinity-tdebase >= %{tde_version}
228
+Requires:		trinity-konqueror >= %{tde_version}
151 229
 Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
152 230
 
153 231
 %description konq-plugins
@@ -156,6 +234,15 @@ This plugin enables audio/video playback inside konqueror, using Xine (with
156 234
 tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
157 235
 browser plugins.
158 236
 
237
+%files konq-plugins
238
+%defattr(-,root,root,-)
239
+%{tde_tdelibdir}/libkmplayerpart.la
240
+%{tde_tdelibdir}/libkmplayerpart.so
241
+%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
242
+%{tde_datadir}/apps/kmplayer/pluginsinfo
243
+%{tde_datadir}/services/kmplayer_part.desktop
244
+
245
+##########
159 246
 
160 247
 %package doc
161 248
 Group:			Applications/Multimedia
@@ -165,14 +252,21 @@ Summary:		Handbook for KMPlayer [Trinity]
165 252
 %description doc
166 253
 Documention for KMPlayer, a basic audio/video viewer application for TDE.
167 254
 
255
+%files doc
256
+%defattr(-,root,root,-)
257
+%{tde_tdedocdir}/HTML/*/kmplayer
258
+
259
+##########
168 260
 
169
-%if 0%{?suse_version} || 0%{?pclinuxos}
261
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
170 262
 %debug_package
171 263
 %endif
172 264
 
265
+##########
173 266
 
174 267
 %prep
175 268
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
269
+%patch0 -p1 -b .orig
176 270
 
177 271
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
178 272
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -214,70 +308,16 @@ export PATH="%{tde_bindir}:${PATH}"
214 308
 # Removes unwanted files
215 309
 %__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
216 310
 
311
+# Updates applications categories for openSUSE
312
+%if 0%{?suse_version}
313
+%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
314
+%endif
315
+
217 316
 
218 317
 %clean
219 318
 %__rm -rf %{buildroot}
220 319
 
221 320
 
222
-%post
223
-/sbin/ldconfig || :
224
-
225
-%postun
226
-/sbin/ldconfig || :
227
-
228
-%post base
229
-touch --no-create %{tde_datadir}/icons/hicolor || :
230
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
231
-/sbin/ldconfig || :
232
-
233
-%postun base
234
-touch --no-create %{tde_datadir}/icons/hicolor || :
235
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
236
-/sbin/ldconfig || :
237
-
238
-
239
-%files -f %{tde_pkg}.lang
240
-%defattr(-,root,root,-)
241
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
242
-%{tde_bindir}/kmplayer
243
-%{tde_bindir}/knpplayer
244
-%{tde_bindir}/kxvplayer
245
-%{tde_libdir}/libtdeinit_kmplayer.la
246
-%{tde_libdir}/libtdeinit_kmplayer.so
247
-%{tde_tdelibdir}/kmplayer.la
248
-%{tde_tdelibdir}/kmplayer.so
249
-%{tde_tdeappdir}/kmplayer.desktop
250
-%{tde_datadir}/apps/kmplayer
251
-%{tde_datadir}/services/kmplayer_part.desktop
252
-
253
-%files base
254
-%defattr(-,root,root,-)
255
-%{tde_libdir}/libkmplayercommon.la
256
-%{tde_libdir}/libkmplayercommon.so
257
-%{tde_bindir}/kgstplayer
258
-%{tde_bindir}/kxineplayer
259
-%{tde_datadir}/config/kmplayerrc
260
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
261
-%{tde_datadir}/apps/kmplayer/noise.gif
262
-%{tde_datadir}/apps/kmplayer/pluginsinfo
263
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
264
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
265
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
266
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
267
-
268
-%files doc
269
-%defattr(-,root,root,-)
270
-%{tde_tdedocdir}/HTML/*/kmplayer
271
-
272
-%files konq-plugins
273
-%defattr(-,root,root,-)
274
-%{tde_tdelibdir}/libkmplayerpart.la
275
-%{tde_tdelibdir}/libkmplayerpart.so
276
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
277
-%{tde_datadir}/apps/kmplayer/pluginsinfo
278
-%{tde_datadir}/services/kmplayer_part.desktop
279
-
280
-
281 321
 %changelog
282
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-8
322
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1
283 323
 - Initial release for TDE 14.0.0

+ 0
- 45
redhat/applications/kmplayer/kmplayer-3.5.13-fix_gcc47_compilation.patch View File

@@ -1,45 +0,0 @@
1
-commit 5106117b5c1439d3fee08395c1a025f62d30a53e
2
-Author: Darrell Anderson <humanreadable@yahoo.com>
3
-Date:   1335631986 -0500
4
-
5
-    GCC 4.7 fixes.
6
-
7
-diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
8
-index ebf7b0d..c4bf580 100644
9
---- a/src/gstplayer.cpp
10
-+++ b/src/gstplayer.cpp
11
-@@ -1003,11 +1003,16 @@ int main(int argc, char **argv) {
12
-     gstapp->exec ();
13
- 
14
-     XLockDisplay(display);
15
--    XClientMessageEvent ev = {
16
--        ClientMessage, 0, true, display, wid, 
17
--        XInternAtom (display, "XVIDEO", false), 8, {b: "quit_now"}
18
--    };
19
--    XSendEvent (display, wid, false, StructureNotifyMask, (XEvent *) & ev);
20
-+    XEvent ev;
21
-+    ev.xclient.type = ClientMessage;
22
-+    ev.xclient.serial = 0;
23
-+    ev.xclient.send_event = true;
24
-+    ev.xclient.display = display;
25
-+    ev.xclient.window = wid;
26
-+    ev.xclient.message_type = XInternAtom (display, "XVIDEO", false);
27
-+    ev.xclient.format = 8;
28
-+    strcpy(ev.xclient.data.b, "quit_now");
29
-+    XSendEvent (display, wid, false, StructureNotifyMask, &ev);
30
-     XFlush (display);
31
-     XUnlockDisplay(display);
32
-     eventThread->wait (500);
33
-diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
34
-index 27b26cd..bdeac91 100644
35
---- a/src/kmplayerapp.cpp
36
-+++ b/src/kmplayerapp.cpp
37
-@@ -17,6 +17,8 @@
38
- 
39
- #undef Always
40
- 
41
-+#include <unistd.h>
42
-+
43
- // include files for QT
44
- #include <tqdatastream.h>
45
- #include <tqregexp.h>

+ 0
- 21
redhat/applications/kmplayer/kmplayer-3.5.13-missing_ldflags.patch View File

@@ -1,21 +0,0 @@
1
---- kmplayer/src/Makefile.am.ORI	2012-08-05 17:09:59.963896862 +0200
2
-+++ kmplayer/src/Makefile.am	2012-08-05 17:10:16.667563785 +0200
3
-@@ -6,7 +6,7 @@
4
- 
5
- libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
6
- libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries)
7
--libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS)
8
-+libkmplayercommon_la_LIBADD = -lkmediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_KDECORE) -lkdefx $(LIB_KDEUI) $(LIB_KIO)
9
- 
10
- if include_koffice_support
11
- kofficeplugin_lib= libkmplayerkofficepart.la
12
---- kmplayer/src/Makefile.am.ORI	2011-12-03 23:22:01.601981533 +0100
13
-+++ kmplayer/src/Makefile.am	2011-12-03 23:22:44.469655046 +0100
14
-@@ -58,6 +58,7 @@
15
- kgstplayer_SOURCES= gstplayer.cpp
16
- 
17
- knpplayer_LDADD= $(LIBNSPR_LIBS)
18
-+knpplayer_LDFLAGS= -lX11 -lgmodule-2.0
19
- knpplayer_SOURCES= npplayer.c
20
- 
21
- xdg_apps_DATA = kmplayer.desktop

+ 0
- 112
redhat/applications/kmplayer/kmplayer-3.5.13.1-fix_xine12_support.patch View File

@@ -1,112 +0,0 @@
1
-Index: b/src/xineplayer.cpp
2
-===================================================================
3
---- a/src/xineplayer.cpp	2012-10-30 18:39:16.000000000 +0000
4
-+++ b/src/xineplayer.cpp	2012-11-03 17:56:01.760234144 +0000
5
-@@ -528,7 +528,11 @@
6
-     xine_event_create_listener_thread (event_queue, event_listener, NULL);
7
-     if (mrl == "cdda:/") {
8
-         int nr;
9
-+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
10
-+        const char * const* mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
11
-+#else
12
-         char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr);
13
-+#endif
14
-         running = 1;
15
-         for (int i = 0; i < nr; i++) {
16
-             TQString m (mrls[i]);
17
-@@ -863,10 +867,10 @@
18
-                             case XK_p: // previous
19
-                                 mutex.lock ();
20
-                                 if (stream) {
21
--                                    xine_event_t xine_event =  { 
22
--                                        XINE_EVENT_INPUT_PREVIOUS,
23
--                                        stream, 0L, 0, { 0, 0 }
24
--                                    };
25
-+                                    xine_event_t xine_event;
26
-+                                    memset(&xine_event, 0, sizeof(xine_event));
27
-+                                    xine_event.type = XINE_EVENT_INPUT_PREVIOUS;
28
-+                                    xine_event.stream = stream;
29
-                                     xine_event_send (stream, &xine_event);
30
-                                 } 
31
-                                 mutex.unlock ();
32
-@@ -875,10 +879,10 @@
33
-                             case XK_n: // next
34
-                                 mutex.lock ();
35
-                                 if (stream) {
36
--                                    xine_event_t xine_event =  { 
37
--                                        XINE_EVENT_INPUT_NEXT,
38
--                                        stream, 0L, 0, { 0, 0 }
39
--                                    };
40
-+                                    xine_event_t xine_event;
41
-+                                    memset(&xine_event, 0, sizeof(xine_event));
42
-+                                    xine_event.type = XINE_EVENT_INPUT_NEXT;
43
-+                                    xine_event.stream = stream;
44
-                                     xine_event_send (stream, &xine_event);
45
-                                 } 
46
-                                 mutex.unlock ();
47
-@@ -887,10 +891,10 @@
48
-                             case XK_u: // up menu
49
-                                 mutex.lock ();
50
-                                 if (stream) {
51
--                                    xine_event_t xine_event =  { 
52
--                                        XINE_EVENT_INPUT_MENU1,
53
--                                        stream, 0L, 0, { 0, 0 }
54
--                                    };
55
-+                                    xine_event_t xine_event;
56
-+                                    memset(&xine_event, 0, sizeof(xine_event));
57
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU1;
58
-+                                    xine_event.stream = stream;
59
-                                     xine_event_send (stream, &xine_event);
60
-                                 } 
61
-                                 mutex.unlock ();
62
-@@ -899,10 +903,10 @@
63
-                             case XK_r: // root menu
64
-                                 mutex.lock ();
65
-                                 if (stream) {
66
--                                    xine_event_t xine_event =  { 
67
--                                        XINE_EVENT_INPUT_MENU3,
68
--                                        stream, 0L, 0, { 0, 0 }
69
--                                    };
70
-+                                    xine_event_t xine_event;
71
-+                                    memset(&xine_event, 0, sizeof(xine_event));
72
-+                                    xine_event.type = XINE_EVENT_INPUT_MENU3;
73
-+                                    xine_event.stream = stream;
74
-                                     xine_event_send (stream, &xine_event);
75
-                                 } 
76
-                                 mutex.unlock ();
77
-@@ -985,11 +989,12 @@
78
-                         data.x = rect.x;
79
-                         data.y = rect.y;
80
-                         data.button = 0;
81
--                        xine_event_t xine_event =  { 
82
--                                XINE_EVENT_INPUT_MOUSE_MOVE,
83
--                                stream, &data, sizeof (xine_input_data_t),
84
--                                { 0 , 0 }
85
--                        };
86
-+                        xine_event_t xine_event;
87
-+                        memset(&xine_event, 0, sizeof(xine_event));
88
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
89
-+                        xine_event.stream = stream;
90
-+                        xine_event.data = &data;
91
-+                        xine_event.data_length = sizeof (xine_input_data_t);
92
-                         mutex.lock ();
93
-                         xine_event_send (stream, &xine_event);
94
-                         mutex.unlock ();
95
-@@ -1023,11 +1028,12 @@
96
-                         data.x = rect.x;
97
-                         data.y = rect.y;
98
-                         data.button = 1;
99
--                        xine_event_t xine_event =  { 
100
--                                XINE_EVENT_INPUT_MOUSE_BUTTON,
101
--                                stream, &data, sizeof (xine_input_data_t),
102
--                                { 0, 0 }
103
--                        };
104
-+                        xine_event_t xine_event;
105
-+                        memset(&xine_event, 0, sizeof(xine_event));
106
-+                        xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
107
-+                        xine_event.stream = stream;
108
-+                        xine_event.data = &data;
109
-+                        xine_event.data_length = sizeof (xine_input_data_t);
110
-                         mutex.lock ();
111
-                         xine_event_send (stream, &xine_event);
112
-                         mutex.unlock ();

+ 0
- 247
redhat/applications/kmplayer/kmplayer-3.5.13.1.spec View File

@@ -1,247 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp kmplayer
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-%define tde_appdir %{tde_datadir}/applications
17
-
18
-%define tde_tdeappdir %{tde_appdir}/kde
19
-%define tde_tdedocdir %{tde_docdir}/tde
20
-%define tde_tdeincludedir %{tde_includedir}/tde
21
-%define tde_tdelibdir %{tde_libdir}/trinity
22
-
23
-%define _docdir %{tde_docdir}
24
-
25
-
26
-Name:		trinity-%{kdecomp}
27
-Summary:	media player for Trinity
28
-Version:	0.10.0c
29
-Release:	4%{?dist}%{?_variant}
30
-
31
-License:	GPLv2+
32
-Group:		Applications/Multimedia
33
-
34
-Vendor:		Trinity Project
35
-Packager:	Francois Andriot <francois.andriot@free.fr>
36
-URL:		http://kmplayer.kde.org
37
-
38
-Prefix:		%{tde_prefix}
39
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
-
41
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
42
-
43
-# [kmplayer] Fix xine 1.2 support
44
-Patch1:		kmplayer-3.5.13.1-fix_xine12_support.patch
45
-
46
-
47
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
48
-BuildRequires:	trinity-dbus-tqt-devel >= 3.5.13.1
49
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
50
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
51
-BuildRequires:	desktop-file-utils
52
-
53
-
54
-%if 0%{?mgaversion} || 0%{?mdkversion}
55
-BuildRequires:	%{_lib}gstreamer0.10-devel
56
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
57
-BuildRequires:	libxv-devel
58
-%endif
59
-%if 0%{?rhel} || 0%{?fedora}
60
-BuildRequires:	gstreamer-devel
61
-BuildRequires:	gstreamer-plugins-base-devel
62
-BuildRequires:	libXv-devel
63
-%endif
64
-%if 0%{?suse_version}
65
-BuildRequires:	gstreamer-devel
66
-BuildRequires:	gstreamer-0_10-plugins-base-devel
67
-BuildRequires:	libXv-devel
68
-%endif
69
-
70
-Requires:	%{name}-base
71
-
72
-%description
73
-A basic audio/video viewer application for Trinity.
74
-
75
-KMPlayer can:
76
-* play DVD (DVDNav only with the Xine player)
77
-* play VCD
78
-* let the backend players play from a pipe (read from stdin)
79
-* play from a TV device (experimental)
80
-* show backend player's console output
81
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
82
-* DCOP KMediaPlayer interface support
83
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
84
-  shortcut configure window
85
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
86
-  (if you have VDR) and volume increase/decrease
87
-
88
-
89
-%package base
90
-Group:			Applications/Multimedia
91
-Summary:		Base files for KMPlayer [Trinity]
92
-
93
-%description base
94
-Core files needed for KMPlayer.
95
-
96
-
97
-%package konq-plugins
98
-Group:			Applications/Multimedia
99
-Requires:		trinity-kmplayer-base, trinity-kdebase
100
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
101
-
102
-%description konq-plugins
103
-This plugin enables audio/video playback inside konqueror, using Xine (with
104
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
105
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
106
-browser plugins.
107
-
108
-
109
-%package doc
110
-Group:			Applications/Multimedia
111
-Requires:		%{name} = %{version}-%{release}
112
-Summary:		Handbook for KMPlayer [Trinity]
113
-
114
-%description doc
115
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
116
-
117
-
118
-%if 0%{?suse_version} || 0%{?pclinuxos}
119
-%debug_package
120
-%endif
121
-
122
-
123
-%prep
124
-%setup -q -n %{kdecomp}-3.5.13.1
125
-%patch1 -p1
126
-
127
-# Ugly hack to modify TQT include directory inside autoconf files.
128
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
129
-%__sed -i admin/acinclude.m4.in \
130
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
131
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
132
-
133
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
134
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
135
-%__make -f "admin/Makefile.common"
136
-
137
-
138
-
139
-%build
140
-unset QTDIR; . /etc/profile.d/qt3.sh
141
-export PATH="%{tde_bindir}:${PATH}"
142
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
143
-
144
-%configure \
145
-  --prefix=%{tde_prefix} \
146
-  --exec-prefix=%{tde_prefix} \
147
-  --bindir=%{tde_bindir} \
148
-  --datadir=%{tde_datadir} \
149
-  --includedir=%{tde_tdeincludedir} \
150
-  --libdir=%{tde_libdir} \
151
-  --mandir=%{tde_mandir} \
152
-  --disable-rpath \
153
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
154
-  --enable-closure
155
-
156
-
157
-%__make %{?_smp_mflags}
158
-
159
-
160
-%install
161
-export PATH="%{tde_bindir}:${PATH}"
162
-%__rm -rf %{buildroot}
163
-%__make install DESTDIR=%{buildroot}
164
-
165
-%find_lang %{kdecomp}
166
-
167
-# Removes unwanted files
168
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
169
-
170
-
171
-%clean
172
-%__rm -rf %{buildroot}
173
-
174
-
175
-%post
176
-/sbin/ldconfig || :
177
-
178
-%postun
179
-/sbin/ldconfig || :
180
-
181
-%post base
182
-touch --no-create %{tde_datadir}/icons/hicolor || :
183
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
184
-/sbin/ldconfig || :
185
-
186
-%postun base
187
-touch --no-create %{tde_datadir}/icons/hicolor || :
188
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
189
-/sbin/ldconfig || :
190
-
191
-
192
-%files -f %{kdecomp}.lang
193
-%defattr(-,root,root,-)
194
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
195
-%{tde_bindir}/kmplayer
196
-%{tde_bindir}/knpplayer
197
-%{tde_bindir}/kxvplayer
198
-%{tde_libdir}/libkdeinit_kmplayer.la
199
-%{tde_libdir}/libkdeinit_kmplayer.so
200
-%{tde_tdelibdir}/kmplayer.la
201
-%{tde_tdelibdir}/kmplayer.so
202
-%{tde_tdeappdir}/kmplayer.desktop
203
-%{tde_datadir}/apps/kmplayer
204
-%{tde_datadir}/services/kmplayer_part.desktop
205
-
206
-%files base
207
-%defattr(-,root,root,-)
208
-%{tde_libdir}/libkmplayercommon.la
209
-%{tde_libdir}/libkmplayercommon.so
210
-%{tde_bindir}/kgstplayer
211
-%{tde_bindir}/kxineplayer
212
-%{tde_datadir}/config/kmplayerrc
213
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
214
-%{tde_datadir}/apps/kmplayer/noise.gif
215
-%{tde_datadir}/apps/kmplayer/pluginsinfo
216
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
217
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
218
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
219
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
220
-
221
-
222
-%files doc
223
-%defattr(-,root,root,-)
224
-%{tde_tdedocdir}/HTML/*/kmplayer
225
-
226
-%files konq-plugins
227
-%defattr(-,root,root,-)
228
-%{tde_tdelibdir}/libkmplayerpart.la
229
-%{tde_tdelibdir}/libkmplayerpart.so
230
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
231
-%{tde_datadir}/apps/kmplayer/pluginsinfo
232
-%{tde_datadir}/services/kmplayer_part.desktop
233
-
234
-
235
-%changelog
236
-* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4
237
-- Fix xine 1.2 support (openSUSE 12.2 only)
238
-
239
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
240
-- Initial release for TDE 3.5.13.1
241
-
242
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
243
-- Fix compilation with GCC 4.7 [Commit #5106117b]
244
-
245
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
246
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
247
-

+ 0
- 232
redhat/applications/kmplayer/kmplayer-3.5.13.spec View File

@@ -1,232 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp kmplayer
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-%define tde_appdir %{tde_datadir}/applications
17
-
18
-%define tde_tdeappdir %{tde_appdir}/kde
19
-%define tde_tdedocdir %{tde_docdir}/kde
20
-%define tde_tdeincludedir %{tde_includedir}/kde
21
-%define tde_tdelibdir %{tde_libdir}/trinity
22
-
23
-%define _docdir %{tde_docdir}
24
-
25
-
26
-Name:		trinity-%{kdecomp}
27
-Summary:	media player for Trinity
28
-Version:	0.10.0c
29
-Release:	2%{?dist}%{?_variant}
30
-
31
-License:	GPLv2+
32
-Group:		Applications/Multimedia
33
-
34
-Vendor:		Trinity Project
35
-Packager:	Francois Andriot <francois.andriot@free.fr>
36
-URL:		http://kmplayer.kde.org
37
-
38
-Prefix:		%{tde_prefix}
39
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
-
41
-Source0:	%{kdecomp}-3.5.13.tar.gz
42
-
43
-# [kmplayer] Fix compilation with GCC 4.7 [Commit #5106117b]
44
-Patch1:		kmplayer-3.5.13-fix_gcc47_compilation.patch
45
-
46
-# [kmplayer] Missing LDLFLAGS cause FTBFS
47
-Patch2:		kmplayer-3.5.13-missing_ldflags.patch
48
-
49
-BuildRequires: tqtinterface-devel
50
-BuildRequires: trinity-tdelibs-devel
51
-BuildRequires: trinity-tdebase-devel
52
-BuildRequires: desktop-file-utils
53
-
54
-BuildRequires:	dbus-tqt-devel
55
-
56
-%if 0%{?mgaversion} || 0%{?mdkversion}
57
-BuildRequires:	%{_lib}gstreamer0.10-devel
58
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
59
-BuildRequires:	libxv-devel
60
-%else
61
-BuildRequires:	gstreamer-devel
62
-BuildRequires:	gstreamer-plugins-base-devel
63
-BuildRequires:	libXv-devel
64
-%endif
65
-
66
-Requires:	%{name}-base
67
-
68
-%description
69
-A basic audio/video viewer application for Trinity.
70
-
71
-KMPlayer can:
72
-* play DVD (DVDNav only with the Xine player)
73
-* play VCD
74
-* let the backend players play from a pipe (read from stdin)
75
-* play from a TV device (experimental)
76
-* show backend player's console output
77
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
78
-* DCOP KMediaPlayer interface support
79
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard KDE
80
-  shortcut configure window
81
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
82
-  (if you have VDR) and volume increase/decrease
83
-
84
-
85
-%package base
86
-Group:			Applications/Multimedia
87
-Summary:		Base files for KMPlayer [Trinity]
88
-
89
-%description base
90
-Core files needed for KMPlayer.
91
-
92
-
93
-%package konq-plugins
94
-Group:			Applications/Multimedia
95
-Requires:		trinity-kmplayer-base, trinity-kdebase
96
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
97
-
98
-%description konq-plugins
99
-This plugin enables audio/video playback inside konqueror, using Xine (with
100
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
101
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
102
-browser plugins.
103
-
104
-
105
-%package doc
106
-Group:			Applications/Multimedia
107
-Requires:		%{name} = %{version}-%{release}
108
-Summary:		Handbook for KMPlayer [Trinity]
109
-
110
-%description doc
111
-Documention for KMPlayer, a basic audio/video viewer application for KDE.
112
-
113
-
114
-%prep
115
-%setup -q -n applications/%{kdecomp}
116
-%patch1 -p1
117
-%patch2 -p1
118
-
119
-# Ugly hack to modify TQT include directory inside autoconf files.
120
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
121
-%__sed -i admin/acinclude.m4.in \
122
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
123
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
124
-
125
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
126
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
127
-%__make -f "admin/Makefile.common"
128
-
129
-
130
-
131
-%build
132
-unset QTDIR; . /etc/profile.d/qt.sh
133
-export PATH="%{tde_bindir}:${PATH}"
134
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
135
-
136
-%configure \
137
-  --prefix=%{tde_prefix} \
138
-  --exec-prefix=%{tde_prefix} \
139
-  --bindir=%{tde_bindir} \
140
-  --datadir=%{tde_datadir} \
141
-  --libdir=%{tde_libdir} \
142
-  --mandir=%{tde_mandir} \
143
-  --disable-rpath \
144
-  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/dbus-1.0 \
145
-  --enable-closure
146
-
147
-
148
-%__make %{?_smp_mflags}
149
-
150
-
151
-%install
152
-export PATH="%{tde_bindir}:${PATH}"
153
-%__rm -rf %{buildroot}
154
-%__make install DESTDIR=%{buildroot}
155
-
156
-%find_lang %{kdecomp}
157
-
158
-# Removes unwanted files
159
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
160
-
161
-
162
-%clean
163
-%__rm -rf %{buildroot}
164
-
165
-
166
-%post
167
-/sbin/ldconfig || :
168
-
169
-%postun
170
-/sbin/ldconfig || :
171
-
172
-%post base
173
-touch --no-create %{tde_datadir}/icons/hicolor || :
174
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
175
-/sbin/ldconfig || :
176
-
177
-%postun base
178
-touch --no-create %{tde_datadir}/icons/hicolor || :
179
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
180
-/sbin/ldconfig || :
181
-
182
-
183
-%files -f %{kdecomp}.lang
184
-%defattr(-,root,root,-)
185
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
186
-%{tde_bindir}/kmplayer
187
-%{tde_bindir}/knpplayer
188
-%{tde_bindir}/kxvplayer
189
-%{tde_libdir}/libkdeinit_kmplayer.la
190
-%{tde_libdir}/libkdeinit_kmplayer.so
191
-%{tde_tdelibdir}/kmplayer.la
192
-%{tde_tdelibdir}/kmplayer.so
193
-%{tde_tdeappdir}/kmplayer.desktop
194
-%{tde_datadir}/apps/kmplayer
195
-%{tde_datadir}/services/kmplayer_part.desktop
196
-
197
-%files base
198
-%defattr(-,root,root,-)
199
-%{tde_libdir}/libkmplayercommon.la
200
-%{tde_libdir}/libkmplayercommon.so
201
-%{tde_bindir}/kgstplayer
202
-%{tde_bindir}/kxineplayer
203
-%{tde_datadir}/config/kmplayerrc
204
-%{tde_datadir}/apps/kmplayer/bookmarks.xml
205
-%{tde_datadir}/apps/kmplayer/noise.gif
206
-%{tde_datadir}/apps/kmplayer/pluginsinfo
207
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
208
-%{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
209
-%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
210
-%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
211
-
212
-
213
-%files doc
214
-%defattr(-,root,root,-)
215
-%{tde_tdedocdir}/HTML/*/kmplayer
216
-
217
-%files konq-plugins
218
-%defattr(-,root,root,-)
219
-%{tde_tdelibdir}/libkmplayerpart.la
220
-%{tde_tdelibdir}/libkmplayerpart.so
221
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
222
-%{tde_datadir}/apps/kmplayer/pluginsinfo
223
-%{tde_datadir}/services/kmplayer_part.desktop
224
-
225
-
226
-%Changelog
227
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-2
228
-- Fix compilation with GCC 4.7 [Commit #5106117b]
229
-
230
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-1
231
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
232
-

+ 126
- 90
redhat/applications/kmyfirewall/kmyfirewall-14.0.0.spec View File

@@ -1,52 +1,78 @@
1
-# Default version for this component
2
-%define tde_pkg kmyfirewall
1
+#
2
+# spec file for package kmyfirewall (version R14.0.0)
3
+#
4
+# Copyright (c) 2014 Trinity Desktop Environment
5
+#
6
+# All modifications and additions to the file contributed by third parties
7
+# remain the property of their copyright owners, unless otherwise agreed
8
+# upon. The license for this file, and modifications and additions to the
9
+# file, is the same license as for the pristine package itself (unless the
10
+# license for the pristine package is not an Open Source License, in which
11
+# case the license is the MIT License). An "Open Source License" is a
12
+# license that conforms to the Open Source Definition (Version 1.9)
13
+# published by the Open Source Initiative.
14
+#
15
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
16
+#
17
+
18
+# TDE variables
19
+%define tde_epoch 2
3 20
 %define tde_version 14.0.0
4
-
5
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
6
-%if "%{?tde_prefix}" != "/usr"
7
-%define _variant .opt
8
-%endif
9
-
10
-# TDE specific building variables
21
+%define tde_pkg kmyfirewall
22
+%define tde_prefix /opt/trinity
11 23
 %define tde_bindir %{tde_prefix}/bin
12 24
 %define tde_datadir %{tde_prefix}/share
13 25
 %define tde_docdir %{tde_datadir}/doc
14 26
 %define tde_includedir %{tde_prefix}/include
15 27
 %define tde_libdir %{tde_prefix}/%{_lib}
16 28
 %define tde_mandir %{tde_datadir}/man
17
-%define tde_appdir %{tde_datadir}/applications
18
-
19
-%define tde_tdeappdir %{tde_appdir}/tde
29
+%define tde_tdeappdir %{tde_datadir}/applications/tde
20 30
 %define tde_tdedocdir %{tde_docdir}/tde
21 31
 %define tde_tdeincludedir %{tde_includedir}/tde
22 32
 %define tde_tdelibdir %{tde_libdir}/trinity
23 33
 
24
-%define _docdir %{tde_docdir}
25 34
 
35
+Name:		trinity-%{tde_pkg}
36
+Epoch:		%{tde_epoch}
37
+Version:	1.1.1
38
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
39
+Summary:	Iptables based firewall configuration tool for TDE
40
+Group:		Applications/Utilities
41
+URL:		http://www.trinitydesktop.org/
26 42
 
27
-Name:			trinity-%{tde_pkg}
28
-Summary:		iptables based firewall configuration tool for TDE [Trinity]
29
-Version:		1.1.1
30
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
31
-
32
-License:		GPLv2+
33
-Group:			Applications/Utilities
43
+%if 0%{?suse_version}
44
+License:	GPL-2.0+
45
+%else
46
+License:	GPLv2+
47
+%endif
34 48
 
35
-Vendor:			Trinity Project
36
-Packager:		Francois Andriot <francois.andriot@free.fr>
37
-URL:			http://www.trinitydesktop.org/
49
+#Vendor:		Trinity Desktop
50
+#Packager:	Francois Andriot <francois.andriot@free.fr>
38 51
 
39
-Prefix:			%{tde_prefix}
40
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
52
+Prefix:		%{tde_prefix}
53
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
41 54
 
42 55
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
43 56
 
44
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
45
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
46 57
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
47 58
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
48 59
 BuildRequires:	desktop-file-utils
49 60
 
61
+BuildRequires:	autoconf automake libtool m4
62
+BuildRequires:	gcc-c++
63
+BuildRequires:	pkgconfig
64
+BuildRequires:	libtool
65
+
66
+# SUSE desktop files utility
67
+%if 0%{?suse_version}
68
+BuildRequires:	update-desktop-files
69
+%endif
70
+
71
+%if 0%{?opensuse_bs} && 0%{?suse_version}
72
+# for xdg-menu script
73
+BuildRequires:	brp-check-trinity
74
+%endif
75
+
50 76
 
51 77
 %description
52 78
 KMyFirewall attempts to make it easier to setup iptables based firewalls on
@@ -60,63 +86,8 @@ configure your rule set one time and then you can use it on several computers
60 86
 giving each of them a similar configuration (p.e. school networks, office,
61 87
 university etc.)
62 88
 
63
-%package devel
64
-Summary:		Development files for %{name}
65
-Group:			Development/Libraries
66
-Requires:		%{name} = %{version}-%{release}
67
-
68
-%description devel
69
-%{summary}
70
-
71
-
72
-%if 0%{?suse_version} || 0%{?pclinuxos}
73
-%debug_package
74
-%endif
75
-
76
-
77
-%prep
78
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
79
-
80
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
81
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
82
-%__make -f "admin/Makefile.common"
83
-
84
-
85
-%build
86
-unset QTDIR QTINC QTLIB
87
-export PATH="%{tde_bindir}:${PATH}"
88
-
89
-%configure \
90
-  --prefix=%{tde_prefix} \
91
-  --exec-prefix=%{tde_prefix} \
92
-  --bindir=%{tde_bindir} \
93
-  --datadir=%{tde_datadir} \
94
-  --libdir=%{tde_libdir} \
95
-  --mandir=%{tde_mandir} \
96
-  --includedir=%{tde_tdeincludedir} \
97
-  \
98
-  --disable-dependency-tracking \
99
-  --disable-debug \
100
-  --enable-new-ldflags \
101
-  --enable-final \
102
-  --enable-closure \
103
-  --enable-rpath \
104
-  --disable-gcc-hidden-visibility
105
-
106
-%__make %{?_smp_mflags}
107
-
108
-%install
109
-export PATH="%{tde_bindir}:${PATH}"
110
-%__rm -rf %{buildroot}
111
-%__make install DESTDIR=%{buildroot}
112
-
113
-
114
-%clean
115
-%__rm -rf %{buildroot}
116
-
117
-
118 89
 %post
119
-update-desktop-database %{tde_appdir} > /dev/null
90
+update-desktop-database %{tde_tdeappdir} > /dev/null
120 91
 for f in hicolor locolor; do
121 92
   touch --no-create %{tde_datadir}/icons/${f} || :
122 93
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
@@ -124,14 +95,13 @@ done
124 95
 /sbin/ldconfig || :
125 96
 
126 97
 %postun
127
-update-desktop-database %{tde_appdir} > /dev/null
98
+update-desktop-database %{tde_tdeappdir} > /dev/null
128 99
 for f in hicolor locolor; do
129 100
   touch --no-create %{tde_datadir}/icons/${f} || :
130 101
   gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
131 102
 done
132 103
 /sbin/ldconfig || :
133 104
 
134
-
135 105
 %files
136 106
 %defattr(-,root,root,-)
137 107
 %doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
@@ -173,10 +143,10 @@ done
173 143
 %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
174 144
 %{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
175 145
 %{tde_tdeappdir}/kmyfirewall.desktop
176
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
177
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
178
-%{tde_datadir}/apps/kmfsystray
179
-%{tde_datadir}/apps/kmyfirewall
146
+%{tde_datadir}/apps/kmfgenericinterfacepart/
147
+%{tde_datadir}/apps/kmfipteditorpart/
148
+%{tde_datadir}/apps/kmfsystray/
149
+%{tde_datadir}/apps/kmyfirewall/
180 150
 %{tde_datadir}/config.kcfg/kmfconfig.kcfg
181 151
 %{tde_datadir}/config/kmyfirewallrc
182 152
 %{tde_tdedocdir}/HTML/en/kmyfirewall/
@@ -189,6 +159,16 @@ done
189 159
 %{tde_datadir}/services/kmf*.desktop
190 160
 %{tde_datadir}/servicetypes/kmf*.desktop
191 161
 
162
+##########
163
+
164
+%package devel
165
+Summary:		Development files for %{name}
166
+Group:			Development/Libraries
167
+Requires:		%{name} = %{version}-%{release}
168
+
169
+%description devel
170
+%{summary}
171
+
192 172
 %files devel
193 173
 %{tde_tdeincludedir}/kmyfirewall
194 174
 %{tde_libdir}/libkmfcore.la
@@ -196,6 +176,62 @@ done
196 176
 %{tde_libdir}/libkmfwidgets.la
197 177
 %{tde_libdir}/libkmfwidgets.so
198 178
 
179
+##########
180
+
181
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
182
+%debug_package
183
+%endif
184
+
185
+##########
186
+
187
+
188
+%prep
189
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
190
+
191
+%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
192
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
193
+%__make -f "admin/Makefile.common"
194
+
195
+
196
+%build
197
+unset QTDIR QTINC QTLIB
198
+export PATH="%{tde_bindir}:${PATH}"
199
+
200
+%configure \
201
+  --prefix=%{tde_prefix} \
202
+  --exec-prefix=%{tde_prefix} \
203
+  --bindir=%{tde_bindir} \
204
+  --datadir=%{tde_datadir} \
205
+  --libdir=%{tde_libdir} \
206
+  --mandir=%{tde_mandir} \
207
+  --includedir=%{tde_tdeincludedir} \
208
+  \
209
+  --disable-dependency-tracking \
210
+  --disable-debug \
211
+  --enable-new-ldflags \
212
+  --enable-final \
213
+  --enable-closure \
214
+  --enable-rpath \
215
+  --disable-gcc-hidden-visibility
216
+
217
+%__make %{?_smp_mflags}
218
+
219
+
220
+%install
221
+export PATH="%{tde_bindir}:${PATH}"
222
+%__rm -rf %{buildroot}
223
+%__make install DESTDIR=%{buildroot}
224
+
225
+# Updates applications categories for openSUSE
226
+%if 0%{?suse_version}
227
+%suse_update_desktop_file -r "%{tde_pkg}" System Network
228
+%endif
229
+
230
+
231
+%clean
232
+%__rm -rf %{buildroot}
233
+
234
+
199 235
 %changelog
200
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.1.1-6
236
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.1.1-1
201 237
 - Initial release for TDE 14.0.0

+ 0
- 39
redhat/applications/kmyfirewall/kmyfirewall-3.5.13-fix_gcc47_compilation.patch View File

@@ -1,39 +0,0 @@
1
---- ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp.orig	2012-05-02 04:58:04.051212974 -0400
2
-+++ ./kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp	2012-05-02 05:07:11.093803088 -0400
3
-@@ -305,14 +305,15 @@
4
- 	if ( m_zone && ! m_host ) {
5
- 		if ( onOff ) {
6
- 			m_protocolUsage = 0;
7
--			if ( KMFProtocolUsage* pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
8
-+			KMFProtocolUsage* pro;
9
-+			if ( pro = m_zone->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
10
- 				m_protocolUsage = pro;
11
- 			} else { 
12
- 					KMFUndoEngine::instance()->startTransaction(
13
- 					m_zone,
14
- 					i18n("Add protocol %1 to zone %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_zone->guiName() )
15
- 					);
16
--					KMFProtocolUsage * pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
17
-+					pro = m_zone->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol()->getDOMTree() );
18
- 			
19
- 				if ( pro ) {
20
- 					kdDebug() << "Added Protocol to zone: " << m_zone-> name()  << endl;
21
-@@ -341,15 +342,16 @@
22
- 	} else if ( m_host ) {
23
- 		if ( onOff ) {
24
- 			m_protocolUsage = 0;
25
-+			KMFProtocolUsage* pro;
26
- 			
27
--				if ( KMFProtocolUsage* pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
28
-+				if ( pro = m_host->findProtocolUsageByProtocolUuid( protUsage->protocol()->uuid() ) ) {
29
- 				m_protocolUsage = pro;
30
- 			} else {
31
- 				KMFUndoEngine::instance()->startTransaction(
32
- 					m_host,
33
- 					i18n("Add protocol %1 to host %2.").tqarg( protUsage->protocol()->name() ).tqarg( m_host->guiName() )
34
- 					);
35
--					KMFProtocolUsage * pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
36
-+					pro = m_host->addProtocolUsage( protUsage->protocol()->uuid(), protUsage->protocol() ->getDOMTree() );
37
- 			
38
- 				if ( pro ) {
39
- 					kdDebug() << "Added Protocol to host: " << m_host-> name()  << endl;

+ 0
- 11
redhat/applications/kmyfirewall/kmyfirewall-3.5.13-missing_ldflags.patch View File

@@ -1,11 +0,0 @@
1
---- kmyfirewall/kmyfirewall/core/Makefile.am.ROI	2012-08-05 17:28:28.006801940 +0200
2
-+++ kmyfirewall/kmyfirewall/core/Makefile.am	2012-08-05 17:28:40.878545270 +0200
3
-@@ -53,7 +53,7 @@
4
- 
5
- libkmfcoreincludedir = $(includedir)/kmyfirewall/core/
6
- 
7
--libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO)
8
-+libkmfcore_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
9
- 
10
- libkmfcoreinclude_HEADERS = ipaddress.h \
11
- 	iptable.h \

+ 0
- 208
redhat/applications/kmyfirewall/kmyfirewall-3.5.13.1.spec View File

@@ -1,208 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp kmyfirewall
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-%define tde_appdir %{tde_datadir}/applications
17
-
18
-%define tde_tdeappdir %{tde_appdir}/kde
19
-%define tde_tdedocdir %{tde_docdir}/tde
20
-%define tde_tdeincludedir %{tde_includedir}/tde
21
-%define tde_tdelibdir %{tde_libdir}/trinity
22
-
23
-%define _docdir %{tde_docdir}
24
-
25
-
26
-Name:		trinity-%{kdecomp}
27
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
28
-Version:	1.1.1
29
-Release:	3%{?dist}%{?_variant}
30
-
31
-License:	GPLv2+
32
-Group:		Applications/Utilities
33
-
34
-Vendor:		Trinity Project
35
-Packager:	Francois Andriot <francois.andriot@free.fr>
36
-URL:		http://www.trinitydesktop.org/
37
-
38
-Prefix:		%{tde_prefix}
39
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
-
41
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
42
-
43
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
44
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
45
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
46
-BuildRequires: desktop-file-utils
47
-
48
-
49
-%description
50
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
51
-Linux systems. It will be the right tool if you like to have a so called
52
-"Personal Firewall" running on your Linux box, but don't have the time and/or
53
-the interest to spend hours in front of the iptables manual just to setup a 
54
-Firewall that keeps the "bad" people out.
55
-
56
-There is also the possibility to save entire rule sets, so you only have to
57
-configure your rule set one time and then you can use it on several computers
58
-giving each of them a similar configuration (p.e. school networks, office,
59
-university etc.)
60
-
61
-%package devel
62
-Summary:		Development files for %{name}
63
-Group:			Development/Libraries
64
-Requires:		%{name} = %{version}-%{release}
65
-
66
-%description devel
67
-%{summary}
68
-
69
-
70
-%if 0%{?suse_version} || 0%{?pclinuxos}
71
-%debug_package
72
-%endif
73
-
74
-
75
-%prep
76
-%setup -q -n %{kdecomp}-3.5.13.1
77
-
78
-# Ugly hack to modify TQT include directory inside autoconf files.
79
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
80
-%__sed -i admin/acinclude.m4.in \
81
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
82
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
83
-
84
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
85
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
86
-%__make -f "admin/Makefile.common"
87
-
88
-
89
-%build
90
-unset QTDIR; . /etc/profile.d/qt3.sh
91
-export PATH="%{tde_bindir}:${PATH}"
92
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
93
-
94
-%configure \
95
-  --prefix=%{tde_prefix} \
96
-  --exec-prefix=%{tde_prefix} \
97
-  --bindir=%{tde_bindir} \
98
-  --datadir=%{tde_datadir} \
99
-  --libdir=%{tde_libdir} \
100
-  --mandir=%{tde_mandir} \
101
-  --includedir=%{tde_tdeincludedir} \
102
-  --disable-rpath \
103
-  --with-extra-includes=%{tde_includedir}/tqt \
104
-  --enable-closure
105
-
106
-%__make %{?_smp_mflags}
107
-
108
-%install
109
-export PATH="%{tde_bindir}:${PATH}"
110
-%__rm -rf %{buildroot}
111
-%__make install DESTDIR=%{buildroot}
112
-
113
-
114
-%clean
115
-%__rm -rf %{buildroot}
116
-
117
-
118
-%post
119
-update-desktop-database %{tde_appdir} > /dev/null
120
-for f in hicolor Locolor; do
121
-  touch --no-create %{tde_datadir}/icons/${f} || :
122
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
123
-done
124
-/sbin/ldconfig || :
125
-
126
-%postun
127
-update-desktop-database %{tde_appdir} > /dev/null
128
-for f in hicolor Locolor; do
129
-  touch --no-create %{tde_datadir}/icons/${f} || :
130
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
131
-done
132
-/sbin/ldconfig || :
133
-
134
-
135
-%files
136
-%defattr(-,root,root,-)
137
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
138
-%{tde_bindir}/kmyfirewall
139
-%{tde_libdir}/libkmfcore.so.*
140
-%{tde_libdir}/libkmfwidgets.so.*
141
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
142
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
143
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
144
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
145
-%{tde_tdelibdir}/libkmfinstaller_linux.la
146
-%{tde_tdelibdir}/libkmfinstaller_linux.so
147
-%{tde_tdelibdir}/libkmfinstallerplugin.la
148
-%{tde_tdelibdir}/libkmfinstallerplugin.so
149
-%{tde_tdelibdir}/libkmfipteditorpart.la
150
-%{tde_tdelibdir}/libkmfipteditorpart.so
151
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
152
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
153
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
154
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
155
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
156
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
157
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
158
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
159
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
160
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
161
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
162
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
163
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
164
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
165
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
166
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
167
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
168
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
169
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
170
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
171
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
172
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
173
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
174
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
175
-%{tde_tdeappdir}/kmyfirewall.desktop
176
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
177
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
178
-%{tde_datadir}/apps/kmfsystray
179
-%{tde_datadir}/apps/kmyfirewall
180
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
181
-%{tde_datadir}/config/kmyfirewallrc
182
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
183
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
184
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
185
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
186
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
187
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
188
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
189
-%{tde_datadir}/services/kmf*.desktop
190
-%{tde_datadir}/servicetypes/kmf*.desktop
191
-
192
-%files devel
193
-%{tde_tdeincludedir}/kmyfirewall
194
-%{tde_libdir}/libkmfcore.la
195
-%{tde_libdir}/libkmfcore.so
196
-%{tde_libdir}/libkmfwidgets.la
197
-%{tde_libdir}/libkmfwidgets.so
198
-
199
-%changelog
200
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-3
201
-- Initial release for TDE 3.5.13.1
202
-
203
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
204
-- GCC 4.7 fixes. [Commit #88d2d2a7]
205
-
206
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
207
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
208
-

+ 0
- 207
redhat/applications/kmyfirewall/kmyfirewall-3.5.13.spec View File

@@ -1,207 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp kmyfirewall
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-%define tde_appdir %{tde_datadir}/applications
17
-
18
-%define tde_tdeappdir %{tde_appdir}/kde
19
-%define tde_tdedocdir %{tde_docdir}/kde
20
-%define tde_tdeincludedir %{tde_includedir}/kde
21
-%define tde_tdelibdir %{tde_libdir}/trinity
22
-
23
-%define _docdir %{tde_docdir}
24
-
25
-
26
-Name:		trinity-%{kdecomp}
27
-Summary:	iptables based firewall configuration tool for KDE [Trinity]
28
-Version:	1.1.1
29
-Release:	2%{?dist}%{?_variant}
30
-
31
-License:	GPLv2+
32
-Group:		Applications/Utilities
33
-
34
-Vendor:		Trinity Project
35
-Packager:	Francois Andriot <francois.andriot@free.fr>
36
-URL:		http://www.trinitydesktop.org/
37
-
38
-Prefix:		%{tde_prefix}
39
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
-
41
-Source0:	%{kdecomp}-3.5.13.tar.gz
42
-
43
-# [kmyfirewall] GCC 4.7 fixes. [Commit #88d2d2a7]
44
-Patch1:		kmyfirewall-3.5.13-fix_gcc47_compilation.patch
45
-# [kmyfirefall] Missing LDFLAGS cause FTBFS
46
-Patch2:		kmyfirewall-3.5.13-missing_ldflags.patch
47
-
48
-BuildRequires: tqtinterface-devel
49
-BuildRequires: trinity-tdelibs-devel
50
-BuildRequires: trinity-tdebase-devel
51
-BuildRequires: desktop-file-utils
52
-
53
-
54
-%description
55
-KMyFirewall attempts to make it easier to setup iptables based firewalls on
56
-Linux systems. It will be the right tool if you like to have a so called
57
-"Personal Firewall" running on your Linux box, but don't have the time and/or
58
-the interest to spend hours in front of the iptables manual just to setup a 
59
-Firewall that keeps the "bad" people out.
60
-
61
-There is also the possibility to save entire rule sets, so you only have to
62
-configure your rule set one time and then you can use it on several computers
63
-giving each of them a similar configuration (p.e. school networks, office,
64
-university etc.)
65
-
66
-%package devel
67
-Summary:		Development files for %{name}
68
-Group:			Development/Libraries
69
-Requires:		%{name} = %{version}-%{release}
70
-
71
-%description devel
72
-%{summary}
73
-
74
-
75
-%prep
76
-%setup -q -n applications/%{kdecomp}
77
-%patch1 -p1
78
-%patch2 -p1
79
-
80
-# Ugly hack to modify TQT include directory inside autoconf files.
81
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
82
-%__sed -i admin/acinclude.m4.in \
83
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
84
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
85
-
86
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
87
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
88
-%__make -f "admin/Makefile.common"
89
-
90
-
91
-%build
92
-unset QTDIR; . /etc/profile.d/qt.sh
93
-export PATH="%{tde_bindir}:${PATH}"
94
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
95
-
96
-%configure \
97
-  --prefix=%{tde_prefix} \
98
-  --exec-prefix=%{tde_prefix} \
99
-  --bindir=%{tde_bindir} \
100
-  --datadir=%{tde_datadir} \
101
-  --libdir=%{tde_libdir} \
102
-  --mandir=%{tde_mandir} \
103
-  --includedir=%{tde_tdeincludedir} \
104
-  --disable-rpath \
105
-  --with-extra-includes=%{tde_includedir}/tqt \
106
-  --enable-closure
107
-
108
-%__make %{?_smp_mflags}
109
-
110
-%install
111
-export PATH="%{tde_bindir}:${PATH}"
112
-%__rm -rf %{buildroot}
113
-%__make install DESTDIR=%{buildroot}
114
-
115
-
116
-%clean
117
-%__rm -rf %{buildroot}
118
-
119
-
120
-%post
121
-update-desktop-database %{tde_appdir} > /dev/null
122
-for f in hicolor Locolor; do
123
-  touch --no-create %{tde_datadir}/icons/${f} || :
124
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
125
-done
126
-/sbin/ldconfig || :
127
-
128
-%postun
129
-update-desktop-database %{tde_appdir} > /dev/null
130
-for f in hicolor Locolor; do
131
-  touch --no-create %{tde_datadir}/icons/${f} || :
132
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
133
-done
134
-/sbin/ldconfig || :
135
-
136
-
137
-%files
138
-%defattr(-,root,root,-)
139
-%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
140
-%{tde_bindir}/kmyfirewall
141
-%{tde_libdir}/libkmfcore.so.*
142
-%{tde_libdir}/libkmfwidgets.so.*
143
-%{tde_tdelibdir}/libkmfcompiler_ipt.la
144
-%{tde_tdelibdir}/libkmfcompiler_ipt.so
145
-%{tde_tdelibdir}/libkmfgenericinterfacepart.la
146
-%{tde_tdelibdir}/libkmfgenericinterfacepart.so
147
-%{tde_tdelibdir}/libkmfinstaller_linux.la
148
-%{tde_tdelibdir}/libkmfinstaller_linux.so
149
-%{tde_tdelibdir}/libkmfinstallerplugin.la
150
-%{tde_tdelibdir}/libkmfinstallerplugin.so
151
-%{tde_tdelibdir}/libkmfipteditorpart.la
152
-%{tde_tdelibdir}/libkmfipteditorpart.so
153
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.la
154
-%{tde_tdelibdir}/libkmfruleoptionedit_custom.so
155
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.la
156
-%{tde_tdelibdir}/libkmfruleoptionedit_interface.so
157
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.la
158
-%{tde_tdelibdir}/libkmfruleoptionedit_ip.so
159
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.la
160
-%{tde_tdelibdir}/libkmfruleoptionedit_limit.so
161
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.la
162
-%{tde_tdelibdir}/libkmfruleoptionedit_mac.so
163
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.la
164
-%{tde_tdelibdir}/libkmfruleoptionedit_protocol.so
165
-%{tde_tdelibdir}/libkmfruleoptionedit_state.la
166
-%{tde_tdelibdir}/libkmfruleoptionedit_state.so
167
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.la
168
-%{tde_tdelibdir}/libkmfruleoptionedit_tos.so
169
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.la
170
-%{tde_tdelibdir}/libkmfruletargetoptionedit_log.so
171
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.la
172
-%{tde_tdelibdir}/libkmfruletargetoptionedit_mark.so
173
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.la
174
-%{tde_tdelibdir}/libkmfruletargetoptionedit_nat.so
175
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.la
176
-%{tde_tdelibdir}/libkmfruletargetoptionedit_tos.so
177
-%{tde_tdeappdir}/kmyfirewall.desktop
178
-%{tde_datadir}/apps/kmfgenericinterfacepart/kmfgenericinterfacepartui.rc
179
-%{tde_datadir}/apps/kmfipteditorpart/kmfipteditorpartui.rc
180
-%{tde_datadir}/apps/kmfsystray
181
-%{tde_datadir}/apps/kmyfirewall
182
-%{tde_datadir}/config.kcfg/kmfconfig.kcfg
183
-%{tde_datadir}/config/kmyfirewallrc
184
-%{tde_tdedocdir}/HTML/en/kmyfirewall/
185
-%{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
186
-%{tde_datadir}/icons/Locolor/*/apps/kmyfirewall.png
187
-%{tde_datadir}/mimelnk/application/kmfgrs.desktop
188
-%{tde_datadir}/mimelnk/application/kmfnet.desktop
189
-%{tde_datadir}/mimelnk/application/kmfpkg.desktop
190
-%{tde_datadir}/mimelnk/application/kmfrs.desktop
191
-%{tde_datadir}/services/kmf*.desktop
192
-%{tde_datadir}/servicetypes/kmf*.desktop
193
-
194
-%files devel
195
-%{tde_tdeincludedir}/kmyfirewall
196
-%{tde_libdir}/libkmfcore.la
197
-%{tde_libdir}/libkmfcore.so
198
-%{tde_libdir}/libkmfwidgets.la
199
-%{tde_libdir}/libkmfwidgets.so
200
-
201
-%Changelog
202
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.1.1-2
203
-- GCC 4.7 fixes. [Commit #88d2d2a7]
204
-
205
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 1.1.1-1
206
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
207
-

BIN
redhat/applications/kmymoney/23011-qt-sqlite3-0.2.tar.gz View File


+ 119
- 93
redhat/applications/kmymoney/kmymoney-14.0.0.spec View File

@@ -1,57 +1,79 @@
1
-# Default version for this component
2
-%define tde_pkg kmymoney
1
+#
2
+# spec file for package kmymoney (version R14.0.0)
3
+#
4
+# Copyright (c) 2014 Trinity Desktop Environment
5
+#
6
+# All modifications and additions to the file contributed by third parties
7
+# remain the property of their copyright owners, unless otherwise agreed
8
+# upon. The license for this file, and modifications and additions to the
9
+# file, is the same license as for the pristine package itself (unless the
10
+# license for the pristine package is not an Open Source License, in which
11
+# case the license is the MIT License). An "Open Source License" is a
12
+# license that conforms to the Open Source Definition (Version 1.9)
13
+# published by the Open Source Initiative.
14
+#
15
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
16
+#
17
+
18
+# TDE variables
19
+%define tde_epoch 2
3 20
 %define tde_version 14.0.0
4
-
5
-# Required for Mageia 2: removes the ldflag '--no-undefined'
6
-%define _disable_ld_no_undefined 1
7
-
8
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
9
-%if "%{?tde_prefix}" != "/usr"
10
-%define _variant .opt
11
-%endif
12
-
13
-# TDE specific building variables
21
+%define tde_pkg kmymoney
22
+%define tde_prefix /opt/trinity
14 23
 %define tde_bindir %{tde_prefix}/bin
15 24
 %define tde_datadir %{tde_prefix}/share
16 25
 %define tde_docdir %{tde_datadir}/doc
17 26
 %define tde_includedir %{tde_prefix}/include
18 27
 %define tde_libdir %{tde_prefix}/%{_lib}
19 28
 %define tde_mandir %{tde_datadir}/man
20
-%define tde_appdir %{tde_datadir}/applications
21
-
22
-%define tde_tdeappdir %{tde_appdir}/tde
29
+%define tde_tdeappdir %{tde_datadir}/applications/tde
23 30
 %define tde_tdedocdir %{tde_docdir}/tde
24 31
 %define tde_tdeincludedir %{tde_includedir}/tde
25 32
 %define tde_tdelibdir %{tde_libdir}/trinity
26 33
 
27
-%define _docdir %{tde_docdir}
28
-
29 34
 
30
-Name:			trinity-%{tde_pkg}
31
-Summary:		personal finance manager for TDE
35
+Name:		trinity-%{tde_pkg}
36
+Epoch:		%{tde_epoch}
37
+Version:	1.0.5
38
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
39
+Summary:	Personal finance manager for TDE
40
+Group:		Applications/Utilities
41
+URL:		http://www.trinitydesktop.org/
32 42
 
33
-Version:		1.0.5
34
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
35
-
36
-License:		GPLv2+
37
-Group:			Applications/Utilities
43
+%if 0%{?suse_version}
44
+License:	GPL-2.0+
45
+%else
46
+License:	GPLv2+
47
+%endif
38 48
 
39
-Vendor:			Trinity Project
40
-Packager:		Francois Andriot <francois.andriot@free.fr>
41
-URL:			http://www.trinitydesktop.org/
49
+#Vendor:		Trinity Desktop
50
+#Packager:	Francois Andriot <francois.andriot@free.fr>
42 51
 
43
-Prefix:			%{tde_prefix}
44
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
52
+Prefix:		%{tde_prefix}
53
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
45 54
 
46 55
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
47 56
 Source1:		kmymoneytitlelabel.png
48 57
 
49
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
50
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
51 58
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
52 59
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
53 60
 BuildRequires:	desktop-file-utils
54 61
 
62
+BuildRequires:	autoconf automake libtool m4
63
+BuildRequires:	gcc-c++
64
+BuildRequires:	pkgconfig
65
+BuildRequires:	libtool
66
+
67
+# SUSE desktop files utility
68
+%if 0%{?suse_version}
69
+BuildRequires:	update-desktop-files
70
+%endif
71
+
72
+%if 0%{?opensuse_bs} && 0%{?suse_version}
73
+# for xdg-menu script
74
+BuildRequires:	brp-check-trinity
75
+%endif
76
+
55 77
 BuildRequires:	recode
56 78
 BuildRequires:	libofx-devel
57 79
 
@@ -80,12 +102,42 @@ Requires:		libtqt3-mt-sqlite3
80 102
 
81 103
 Requires:		%{name}-common == %{version}-%{release}
82 104
 
105
+
83 106
 %description
84 107
 KMyMoney is the Personal Finance Manager for TDE. It operates similar to
85 108
 MS-Money and Quicken, supports different account types, categorisation of
86 109
 expenses, QIF import/export, multiple currencies and initial online banking
87 110
 support.
88 111
 
112
+%post
113
+update-desktop-database %{tde_tdeappdir} > /dev/null
114
+/sbin/ldconfig
115
+for f in hicolor locolor Tango oxygen; do
116
+  touch --no-create %{tde_datadir}/icons/${f} || :
117
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
118
+done
119
+
120
+%postun
121
+update-desktop-database %{tde_tdeappdir} > /dev/null
122
+/sbin/ldconfig
123
+for f in hicolor locolor Tango oxygen; do
124
+  touch --no-create %{tde_datadir}/icons/${f} || :
125
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
126
+done
127
+
128
+%files
129
+%defattr(-,root,root,-)
130
+%{tde_bindir}/kmymoney
131
+%{tde_bindir}/kmymoney2
132
+%{tde_tdeappdir}/kmymoney2.desktop
133
+%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
134
+%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
135
+%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
136
+%{tde_libdir}/*.so.*
137
+%{tde_tdelibdir}/kmm_ofximport.la
138
+%{tde_tdelibdir}/kmm_ofximport.so
139
+
140
+##########
89 141
 
90 142
 %package common
91 143
 Summary:		KMyMoney architecture independent files
@@ -97,6 +149,28 @@ This package contains architecture independent files needed for KMyMoney to
97 149
 run properly. It also provides KMyMoney documentation. Therefore, unless you
98 150
 have '%{name}' package installed, you will hardly find this package useful.
99 151
 
152
+%files common -f kmymoney2.lang
153
+%defattr(-,root,root,-)
154
+%{tde_datadir}/apps/kmymoney2/
155
+%{tde_datadir}/config.kcfg/kmymoney2.kcfg
156
+%{tde_datadir}/icons/hicolor/*/*/*.png
157
+%dir %{tde_datadir}/icons/Tango/
158
+%dir %{tde_datadir}/icons/Tango/*/
159
+%dir %{tde_datadir}/icons/Tango/*/*/
160
+%{tde_datadir}/icons/Tango/*/*/*.png
161
+%{tde_datadir}/icons/Tango/scalable/*.svgz
162
+%{tde_datadir}/icons/locolor/*/*/*.png
163
+%dir %{tde_datadir}/icons/oxygen/
164
+%dir %{tde_datadir}/icons/oxygen/*/
165
+%dir %{tde_datadir}/icons/oxygen/*/*/
166
+%{tde_datadir}/icons/oxygen/*/*/*.png
167
+%{tde_datadir}/icons/oxygen/scalable/*.svgz
168
+%{tde_tdedocdir}/HTML/en/kmymoney2/
169
+%{tde_mandir}/man1/kmymoney2.*
170
+%{tde_datadir}/apps/kmm_ofximport/
171
+%{tde_datadir}/services/kmm_ofximport.desktop
172
+
173
+##########
100 174
 
101 175
 %package devel
102 176
 Summary:		KMyMoney development files
@@ -106,11 +180,23 @@ Requires:		%{name} == %{version}-%{release}
106 180
 %description devel
107 181
 This package contains development files needed for KMyMoney plugins.
108 182
 
183
+%files devel
184
+%defattr(-,root,root,-)
185
+%{tde_tdeincludedir}/kmymoney/
186
+%{tde_libdir}/libkmm_kdchart.la
187
+%{tde_libdir}/libkmm_mymoney.la
188
+%{tde_libdir}/libkmm_plugin.la
189
+%{tde_libdir}/*.so
190
+%{_libdir}/tqt3/plugins/designer/libkmymoney.so
109 191
 
110
-%if 0%{?suse_version} || 0%{?pclinuxos}
192
+##########
193
+
194
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
111 195
 %debug_package
112 196
 %endif
113 197
 
198
+##########
199
+
114 200
 
115 201
 %prep
116 202
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -173,66 +259,6 @@ export PATH="%{tde_bindir}:${PATH}"
173 259
 %__rm -rf %{buildroot}
174 260
 
175 261
 
176
-%post
177
-update-desktop-database %{tde_appdir} > /dev/null
178
-/sbin/ldconfig
179
-for f in hicolor locolor Tango oxygen; do
180
-  touch --no-create %{tde_datadir}/icons/${f} || :
181
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
182
-done
183
-
184
-%postun
185
-update-desktop-database %{tde_appdir} > /dev/null
186
-/sbin/ldconfig
187
-for f in hicolor locolor Tango oxygen; do
188
-  touch --no-create %{tde_datadir}/icons/${f} || :
189
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
190
-done
191
-
192
-
193
-%files
194
-%defattr(-,root,root,-)
195
-%{tde_bindir}/kmymoney
196
-%{tde_bindir}/kmymoney2
197
-%{tde_tdeappdir}/kmymoney2.desktop
198
-%{tde_datadir}/mimelnk/application/x-kmymoney2.desktop
199
-%{tde_datadir}/servicetypes/kmymoneyimporterplugin.desktop
200
-%{tde_datadir}/servicetypes/kmymoneyplugin.desktop
201
-%{tde_libdir}/*.so.*
202
-%{tde_tdelibdir}/kmm_ofximport.la
203
-%{tde_tdelibdir}/kmm_ofximport.so
204
-
205
-%files common -f kmymoney2.lang
206
-%defattr(-,root,root,-)
207
-%{tde_datadir}/apps/kmymoney2/html/
208
-%{tde_datadir}/apps/kmymoney2/icons/*/*/*/*.png
209
-%{tde_datadir}/apps/kmymoney2/kmymoney2ui.rc
210
-%{tde_datadir}/apps/kmymoney2/misc/financequote.pl
211
-%{tde_datadir}/apps/kmymoney2/pics/*.png
212
-%{tde_datadir}/apps/kmymoney2/templates/*/*.kmt
213
-%{tde_datadir}/apps/kmymoney2/tips
214
-%{tde_datadir}/config.kcfg/kmymoney2.kcfg
215
-%{tde_datadir}/icons/hicolor/*/*/*.png
216
-%{tde_datadir}/icons/Tango/*/*/*.png
217
-%{tde_datadir}/icons/Tango/scalable/*.svgz
218
-%{tde_datadir}/icons/locolor/*/*/*.png
219
-%{tde_datadir}/icons/oxygen/*/*/*.png
220
-%{tde_datadir}/icons/oxygen/scalable/*.svgz
221
-%{tde_tdedocdir}/HTML/en/kmymoney2/
222
-%{tde_mandir}/man1/kmymoney2.*
223
-%{tde_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
224
-%{tde_datadir}/services/kmm_ofximport.desktop
225
-
226
-%files devel
227
-%defattr(-,root,root,-)
228
-%{tde_tdeincludedir}/kmymoney/*.h
229
-%{tde_libdir}/libkmm_kdchart.la
230
-%{tde_libdir}/libkmm_mymoney.la
231
-%{tde_libdir}/libkmm_plugin.la
232
-%{tde_libdir}/*.so
233
-%{_libdir}/tqt3/plugins/designer/libkmymoney.so
234
-
235
-
236 262
 %changelog
237
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.5-7
263
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.5-1
238 264
 - Initial release for TDE 14.0.0

+ 0
- 11
redhat/applications/kmymoney/kmymoney-3.5.13-fix_gcc47_compilation.patch View File

@@ -1,11 +0,0 @@
1
---- kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp.ORI	2012-05-02 05:22:43.788349181 -0400
2
-+++ kmymoney/kmymoney2/plugins/ofximport/ofxpartner.cpp	2012-05-02 05:23:01.910909490 -0400
3
-@@ -20,6 +20,8 @@
4
- #include <config.h>
5
- #endif
6
- 
7
-+#include <unistd.h>
8
-+
9
- // ----------------------------------------------------------------------------
10
- // QT Includes
11
- 

+ 0
- 238
redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch View File

@@ -1,238 +0,0 @@
1
-commit 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
2
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
3
-Date:   1326525051 -0600
4
-
5
-    Fix a number of crashes
6
-
7
-diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
8
-index 52ef770..880b1c2 100644
9
---- a/kmymoney2/converter/mymoneyqifprofile.cpp
10
-+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
11
-@@ -769,7 +769,7 @@ TQString MyMoneyQifProfile::inputDateFormat(void) const
12
-   possibleDateFormats(list);
13
-   if(list.count() == 1)
14
-     return list.first();
15
--  return TQString();
16
-+  return TQString::null;
17
- }
18
- 
19
- void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
20
-diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
21
-index 9390429..a974e8f 100644
22
---- a/kmymoney2/converter/mymoneyqifreader.cpp
23
-+++ b/kmymoney2/converter/mymoneyqifreader.cpp
24
-@@ -714,7 +714,7 @@ const TQString MyMoneyQifReader::extractLine(const TQChar id, int cnt)
25
-     }
26
-   }
27
-   m_extractedLine = -1;
28
--  return TQString();
29
-+  return TQString::null;
30
- }
31
- 
32
- void MyMoneyQifReader::extractSplits(TQValueList<qSplit>& listqSplits) const
33
-diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
34
-index 4de99f6..beb8e98 100644
35
---- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
36
-+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
37
-@@ -53,7 +53,7 @@ KCategoryReassignDlg::~KCategoryReassignDlg()
38
- TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
39
- {
40
-   if (category.id().isEmpty())
41
--   return TQString(); // no payee available? nothing can be selected...
42
-+   return TQString::null; // no payee available? nothing can be selected...
43
- 
44
-   AccountSet set;
45
-   set.addAccountGroup(MyMoneyAccount::Income);
46
-@@ -79,12 +79,12 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
47
-   // if there is no category for reassignment left, we bail out
48
-   if(list.isEmpty()) {
49
-     KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>.  However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>"));
50
--    return TQString();
51
-+    return TQString::null;
52
-   }
53
- 
54
-   // execute dialog and if aborted, return empty string
55
-   if (this->exec() == TQDialog::Rejected)
56
--    return TQString();
57
-+    return TQString::null;
58
- 
59
-   // otherwise return index of selected payee
60
-   return m_category->selectedItem();
61
-diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
62
-index 884807f..87baaf9 100644
63
---- a/kmymoney2/dialogs/knewloanwizard.cpp
64
-+++ b/kmymoney2/dialogs/knewloanwizard.cpp
65
-@@ -1072,7 +1072,7 @@ int KNewLoanWizard::term(void) const
66
- TQString KNewLoanWizard::initialPaymentAccount(void) const
67
- {
68
-   if(m_dontCreatePayoutCheckBox->isChecked()) {
69
--    return TQString();
70
-+    return TQString::null;
71
-   }
72
-   return m_assetAccountEdit->selectedItems().first();
73
- }
74
-diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
75
-index 0c3c0cf..1db13f1 100644
76
---- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
77
-+++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
78
-@@ -53,13 +53,13 @@ KPayeeReassignDlg::~KPayeeReassignDlg()
79
- TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist)
80
- {
81
-   if (payeeslist.isEmpty())
82
--   return TQString(); // no payee available? nothing can be selected...
83
-+   return TQString::null; // no payee available? nothing can be selected...
84
- 
85
-   payeeCombo->loadPayees(payeeslist);
86
- 
87
-   // execute dialog and if aborted, return empty string
88
-   if (this->exec() == TQDialog::Rejected)
89
--    return TQString();
90
-+    return TQString::null;
91
- 
92
-   // otherwise return index of selected payee
93
-   return payeeCombo->selectedItem();
94
-diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
95
-index 6ef1f9c..c83e834 100644
96
---- a/kmymoney2/mymoney/mymoneyaccount.cpp
97
-+++ b/kmymoney2/mymoney/mymoneyaccount.cpp
98
-@@ -450,7 +450,7 @@ void MyMoneyAccountLoan::setPayee(const TQString& payee)
99
- 
100
- const TQString MyMoneyAccountLoan::interestAccountId(void) const
101
- {
102
--  return TQString();
103
-+  return TQString::null;
104
- }
105
- 
106
- void MyMoneyAccountLoan::setInterestAccountId(const TQString& /* id */)
107
-diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
108
-index 4809b28..c59d577 100644
109
---- a/kmymoney2/mymoney/mymoneyfile.cpp
110
-+++ b/kmymoney2/mymoney/mymoneyfile.cpp
111
-@@ -1230,7 +1230,7 @@ TQString MyMoneyFile::locateSubAccount(const MyMoneyAccount& base, const TQStrin
112
-       return locateSubAccount(nextBase, remainder);
113
-     }
114
-   }
115
--  return TQString();
116
-+  return TQString::null;
117
- }
118
- 
119
- TQString MyMoneyFile::value(const TQString& key) const
120
-diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
121
-index 22fa1ac..cabf772 100644
122
---- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
123
-+++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
124
-@@ -55,7 +55,7 @@ const TQString& MyMoneyKeyValueContainer::value(const TQString& key) const
125
-   it = m_kvp.find(key);
126
-   if(it != m_kvp.end())
127
-     return (*it);
128
--  return TQString();
129
-+  return TQString::null;
130
- }
131
- 
132
- void MyMoneyKeyValueContainer::setValue(const TQString& key, const TQString& value)
133
-diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp
134
-index 08ffff4..8012200 100644
135
---- a/kmymoney2/mymoney/mymoneyutils.cpp
136
-+++ b/kmymoney2/mymoney/mymoneyutils.cpp
137
-@@ -305,7 +305,7 @@ TQString dateToString(const TQDate& date)
138
-   if(!date.isNull() && date.isValid())
139
-     return date.toString(Qt::ISODate);
140
- 
141
--  return TQString();
142
-+  return TQString::null;
143
- }
144
- 
145
- TQDate stringToDate(const TQString& str)
146
-@@ -323,7 +323,7 @@ TQString TQStringEmpty(const TQString& val)
147
-   if(!val.isEmpty())
148
-     return TQString(val);
149
- 
150
--  return TQString();
151
-+  return TQString::null;
152
- }
153
- 
154
- unsigned long extractId(const TQString& txt)
155
-diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
156
-index 084d73c..ec2d4a0 100644
157
---- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
158
-+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
159
-@@ -98,14 +98,14 @@ const TQString& KOnlineBankingtqStatus::appId(void) const
160
- {
161
-   if(m_appId)
162
-     return m_appId->appId();
163
--  return TQString();
164
-+  return TQString::null;
165
- }
166
- 
167
- TQString KOnlineBankingtqStatus::headerVersion(void) const
168
- {
169
-   if(m_headerVersion)
170
-     return m_headerVersion->headerVersion();
171
--  return TQString();
172
-+  return TQString::null;
173
- }
174
- 
175
- #include "konlinebankingstatus.moc"
176
-diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
177
-index 36a05b5..7408a38 100644
178
---- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
179
-+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
180
-@@ -125,7 +125,7 @@ const TQString& OfxAppVersion::appId(void) const
181
-   TQString app = m_combo->currentText();
182
-   if(m_appMap[app] != defaultAppId)
183
-     return m_appMap[app];
184
--  return TQString();
185
-+  return TQString::null;
186
- }
187
- 
188
- MyMoneyOfxConnector::MyMoneyOfxConnector(const MyMoneyAccount& _account):
189
-diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
190
-index f8b6489..761b537 100644
191
---- a/kmymoney2/widgets/kmymoneycombo.cpp
192
-+++ b/kmymoney2/widgets/kmymoneycombo.cpp
193
-@@ -588,7 +588,7 @@ public:
194
-         return it.key();
195
-       }
196
-     }
197
--    return TQString();
198
-+    return TQString::null;
199
-   }
200
- };
201
- 
202
-diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
203
-index ff00c78..f446acf 100644
204
---- a/kmymoney2/widgets/kmymoneywizard.cpp
205
-+++ b/kmymoney2/widgets/kmymoneywizard.cpp
206
-@@ -106,7 +106,7 @@ bool KMyMoneyWizardPage::isComplete(void) const
207
- 
208
- const TQString& KMyMoneyWizardPage::helpContext(void) const
209
- {
210
--  return TQString();
211
-+  return TQString::null;
212
- }
213
- 
214
- KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) :
215
-diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h
216
-index e9c21d3..83b9a04 100644
217
---- a/kmymoney2/widgets/registeritem.h
218
-+++ b/kmymoney2/widgets/registeritem.h
219
-@@ -88,14 +88,14 @@ public:
220
-   virtual const TQDate& sortPostDate(void) const { return nullDate; }
221
-   virtual int sortSamePostDate(void) const = 0;
222
-   virtual const TQDate& sortEntryDate(void) const { return nullDate; }
223
--  virtual const TQString& sortPayee(void) const { return TQString(); }
224
-+  virtual const TQString& sortPayee(void) const { return TQString::null; }
225
-   virtual const MyMoneyMoney& sortValue(void) const { return nullValue; }
226
--  virtual const TQString& sortNumber(void) const { return TQString(); }
227
--  virtual const TQString& sortEntryOrder(void) const { return TQString(); }
228
-+  virtual const TQString& sortNumber(void) const { return TQString::null; }
229
-+  virtual const TQString& sortEntryOrder(void) const { return TQString::null; }
230
-   virtual CashFlowDirection sortType(void) const { return Deposit; }
231
--  virtual const TQString& sortCategory(void) const { return TQString(); }
232
-+  virtual const TQString& sortCategory(void) const { return TQString::null; }
233
-   virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return MyMoneySplit::MaxReconcileState; }
234
--  virtual const TQString& sortSecurity(void) const { return TQString(); }
235
-+  virtual const TQString& sortSecurity(void) const { return TQString::null; }
236
- 
237
-   /**
238
-     * This method sets the row offset of the item in the register

+ 0
- 22
redhat/applications/kmymoney/kmymoney-3.5.13-recode_ftbfs.patch View File

@@ -1,22 +0,0 @@
1
---- kmymoney/doc/en/Makefile.am.ORI	2011-11-26 17:57:22.473298551 +0100
2
-+++ kmymoney/doc/en/Makefile.am	2011-11-26 17:58:18.611423284 +0100
3
-@@ -111,7 +111,7 @@
4
- kmymoney-user.pdf: $(DOCBOOK_FILES) $(SCREENSHOT_FILES)
5
- 	$(MAKE) get-files
6
- 	$(MEINPROC) --check --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl  $(srcdir)/index.docbook -o index.html;
7
--	recode utf8..latin1 index.html
8
-+	recode utf8..latin1 index.html || :
9
- 	html2ps -o kmymoney-user.ps -n index.html
10
- 	ps2pdf kmymoney-user.ps kmymoney-user.pdf
11
- 	rm index.html kmymoney-user.ps
12
---- kmymoney/developer-doc/phb/Makefile.am.ORI	2011-11-26 12:00:54.708855347 -0500
13
-+++ kmymoney/developer-doc/phb/Makefile.am	2011-11-26 12:01:01.683692300 -0500
14
-@@ -106,7 +106,7 @@
15
- kmymoney-phb.pdf: $(DOCBOOK_FILES)
16
- 	$(MAKE) get-files
17
- 	$(MEINPROC) --stylesheet `dirname $(KDE_XSL_STYLESHEET)`/kde-nochunk.xsl $(srcdir)/phb.docbook -o index.html
18
--	recode utf8..latin1 index.html
19
-+	recode utf8..latin1 index.html || :
20
- 	html2ps -o kmymoney-phb.ps -n index.html
21
- 	ps2pdf kmymoney-phb.ps kmymoney-phb.pdf
22
- 	rm index.html kmymoney-phb.ps

+ 0
- 264
redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch View File

@@ -1,264 +0,0 @@
1
-commit 8654cea10f6902719006d5975db7dc07b2fcc713
2
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
3
-Date:   1326571732 -0600
4
-
5
-    Update to upstream stable version 1.0.5
6
-
7
-diff --git a/ChangeLog b/ChangeLog
8
-index d250496..c996acb 100644
9
---- a/ChangeLog
10
-+++ b/ChangeLog
11
-@@ -1,7 +1,40 @@
12
- 
13
-+2010-05-15 Thomas Baumgart <ipwizard@users.sourceforge.net>
14
-+  * Released 1.0.5
15
-+
16
-+2010-05-12 Thomas Baumgart <ipwizard@users.sourceforge.net>
17
-+  * Fixed the way to calculate balance variation for the linear regression
18
-+    forecast method (backported from KDE4)
19
-+
20
-+2010-05-09 Alvaro Soliverez <asoliverez@gmail.com>
21
-+  * Fixed a crash when a budget selected for a report is no longer present
22
-+
23
-+2010-05-04 Thomas Baumgart <ipwizard@users.sourceforge.net>
24
-+  * replace all new line characters because we only have one line
25
-+    available for the displayed data (backported from KDE4)
26
-+  * Don't allow import of investment transactions that don't have a share
27
-+    amount. This used to end in a div by zero when calculating the price.
28
-+    (Backported from KDE4)
29
-+
30
-+2010-05-03 Alvaro Soliverez <asoliverez@gmail.com>
31
-+  * Add all overdue schedules when calculating forecast
32
-+  * Do not show accounts of institutions if it has been selected
33
-+    in the general settings to Do not show closed accounts
34
-+  * Do not show an institution if it has no visible accounts and
35
-+    it has been selected to not show closed accounts
36
-+
37
-+2010-04-20 Thomas Baumgart <ipwizard@users.sourceforge.net>
38
-+  * Backported fix from Ian Neal to solve problems when opening the ledger
39
-+    with specific scheduled transactions
40
-+
41
-+2010-04-03 Alvaro Soliverez <asoliverez@gmail.com>
42
-+  * Fixed loop in payments of the home page when a schedule is set to
43
-+    end by date
44
-+
45
- 2010-03-30 Thomas Baumgart <ipwizard@users.sourceforge.net>
46
-   * Backported encoding patch from KDE4 version
47
-   * Bumped version number
48
-+  * Released 1.0.4
49
- 
50
- 2010-03-29 Thomas Baumgart <ipwizard@users.sourceforge.net>
51
-   * Updated Finnish translation by Mikael Kujanpaa
52
-diff --git a/configure.in b/configure.in
53
-index 8a6c1b8..1a8dd02 100644
54
---- a/configure.in
55
-+++ b/configure.in
56
-@@ -40,7 +40,7 @@ dnl Perform program name transformation
57
- AC_ARG_PROGRAM
58
- 
59
- dnl Automake doc recommends to do this only here. (Janos)
60
--AM_INIT_AUTOMAKE(kmymoney2, 1.0.4) dnl searches for some needed programs
61
-+AM_INIT_AUTOMAKE(kmymoney2, 1.0.5) dnl searches for some needed programs
62
- 
63
- KDE_SET_PREFIX
64
- 
65
-diff --git a/configure.in.in b/configure.in.in
66
-index 3f82103..a90f40f 100644
67
---- a/configure.in.in
68
-+++ b/configure.in.in
69
-@@ -1,6 +1,6 @@
70
- #MIN_CONFIG(3.3.1)
71
- 
72
--AM_INIT_AUTOMAKE(kmymoney2,1.0.4)
73
-+AM_INIT_AUTOMAKE(kmymoney2,1.0.5)
74
- 
75
- KDE_ENABLE_HIDDEN_VISIBILITY
76
- 
77
-diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
78
-index 6756767..c08dcff 100644
79
---- a/kmymoney2/converter/mymoneystatementreader.cpp
80
-+++ b/kmymoney2/converter/mymoneystatementreader.cpp
81
-@@ -664,6 +664,10 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
82
-       if(!t_in.m_price.isZero()) {
83
-         s1.setPrice(t_in.m_price);
84
-       } else {
85
-+        if(t_in.m_shares.isZero()) {
86
-+          KMessageBox::information(0, i18n("This imported statement contains investment transactions with no share amount.  These transactions will be ignored."), i18n("No share amount provided"), TQString("BlankAmount"));
87
-+          return;
88
-+        }
89
-         s1.setPrice(((t_in.m_amount - t_in.m_fees) / t_in.m_shares).convert(MyMoneyMoney::precToDenom(KMyMoneyGlobalSettings::pricePrecision())));
90
-       }
91
- 
92
-diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp
93
-index bfecce0..c1c88c7 100644
94
---- a/kmymoney2/mymoney/mymoneyforecast.cpp
95
-+++ b/kmymoney2/mymoney/mymoneyforecast.cpp
96
-@@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void)
97
-   TQValueList<MyMoneySchedule> schedule;
98
- 
99
-   schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY,
100
--                                TQDate::tqcurrentDate(), forecastEndDate());
101
-+                                TQDate(), forecastEndDate());
102
-   if(schedule.count() > 0) {
103
-     TQValueList<MyMoneySchedule>::Iterator it;
104
-     do {
105
-@@ -871,8 +871,21 @@ MyMoneyMoney MyMoneyForecast::accountCycleVariation(const MyMoneyAccount& acc)
106
-   MyMoneyMoney cycleVariation;
107
- 
108
-   if (forecastMethod() == eHistoric) {
109
--    for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
110
--      cycleVariation += m_accountTrendList[acc.id()][t_day];
111
-+    switch(historyMethod()) {
112
-+      case 0:
113
-+      case 1:
114
-+        {
115
-+          for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
116
-+            cycleVariation += m_accountTrendList[acc.id()][t_day];
117
-+          }
118
-+        }
119
-+        break;
120
-+
121
-+      case 2:
122
-+        {
123
-+          cycleVariation = m_accountList[acc.id()][TQDate::currentDate().addDays(accountsCycle())] - m_accountList[acc.id()][TQDate::currentDate()];
124
-+        }
125
-+        break;
126
-     }
127
-   }
128
-   return cycleVariation;
129
-diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
130
-index db73062..b75ffb9 100644
131
---- a/kmymoney2/reports/pivottable.cpp
132
-+++ b/kmymoney2/reports/pivottable.cpp
133
-@@ -825,9 +825,27 @@ void PivotTable::calculateBudgetMapping( void )
134
-     //
135
-     // It will choose the first budget in the list for the start year of the report if no budget is select
136
-     MyMoneyBudget budget = MyMoneyBudget();
137
-+    
138
-+    TQValueList<MyMoneyBudget> budgets = file->budgetList();
139
-+    bool validBudget = false;
140
-+    
141
-+    //check that the selected budget is valid
142
-+    if (m_config_f.budget() != "Any") {
143
-+      TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
144
-+      while( budgets_it != budgets.end() ) {
145
-+        //pick the budget by id
146
-+        if ((*budgets_it).id() == m_config_f.budget()) {
147
-+          budget = file->budget((*budgets_it).id());
148
-+          validBudget = true;
149
-+          break;
150
-+        }
151
-+        ++budgets_it;
152
-+      }
153
-+    }
154
-+    
155
-     //if no budget has been selected
156
--    if (m_config_f.budget() == "Any" ) {
157
--      TQValueList<MyMoneyBudget> budgets = file->budgetList();
158
-+    if (!validBudget ) {
159
-+      
160
-       TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
161
-       while( budgets_it != budgets.end() ) {
162
-         //pick the first budget that matches the report start year
163
-@@ -843,9 +861,6 @@ void PivotTable::calculateBudgetMapping( void )
164
- 
165
-       //assign the budget to the report
166
-       m_config_f.setBudget(budget.id(), m_config_f.isIncludingBudgetActuals());
167
--    } else {
168
--      //pick the budget selected by the user
169
--      budget = file->budget( m_config_f.budget());
170
-     }
171
- 
172
-     // Dump the budget
173
-diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
174
-index 8209d3f..e82459a 100644
175
---- a/kmymoney2/views/kgloballedgerview.cpp
176
-+++ b/kmymoney2/views/kgloballedgerview.cpp
177
-@@ -485,7 +485,12 @@ void KGlobalLedgerView::loadView(void)
178
-             break;
179
- 
180
-           // for all others, we check if the next payment date is still 'in range'
181
--          s.setNextDueDate(s.nextPayment(s.nextDueDate()));
182
-+          TQDate nextDueDate = s.nextPayment(s.nextDueDate());
183
-+          if (nextDueDate.isValid()) {
184
-+            s.setNextDueDate(nextDueDate);
185
-+          } else {
186
-+            break;
187
-+          }
188
-         }
189
-         scheduleList.pop_front();
190
-       }
191
-diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
192
-index 60bb173..8745d64 100644
193
---- a/kmymoney2/views/khomeview.cpp
194
-+++ b/kmymoney2/views/khomeview.cpp
195
-@@ -595,6 +595,13 @@ void KHomeView::showPayments(void)
196
-           schedule.remove(it);
197
-           continue;
198
-         }
199
-+        
200
-+        //if nextPayment returns an invalid date, setNextDueDate will just skip it, resulting in a loop
201
-+        //we check the resulting date and erase the schedu