summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch15
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec3
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch19
-rw-r--r--redhat/applications/kvpnc/kvpnc-14.0.0.spec5
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec20
-rw-r--r--redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec4
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec8
-rw-r--r--redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec2
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec14
9 files changed, 69 insertions, 21 deletions
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch
new file mode 100644
index 000000000..4ed8c1c52
--- /dev/null
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch
@@ -0,0 +1,15 @@
+--- trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp.ORI 2013-07-20 11:16:18.010011618 +0200
++++ trinity-kdbusnotification-14.0.0~pre89+e169a4e3/src/daemon/daemon.cpp 2013-07-20 11:27:19.135889426 +0200
+@@ -231,9 +231,10 @@
+ }
+
+ // Send a notification request to KDE here...
+- TQString messageText = TQString(body);
++ TQString messageCaption = TQString::fromLocal8Bit(summary);
++ TQString messageText = TQString::fromLocal8Bit(body);
+
+- GTKNotifierContainer->displayMessage(TQString(summary), TQString(body), TQString(icon), x, y);
++ GTKNotifierContainer->displayMessage(messageCaption, messageText, TQString(icon), x, y);
+
+ return_id = 0;
+
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
index 4c4db932d..f4e8b815f 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
@@ -42,6 +42,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: kdbusnotification-14.0.0-fix_utf8.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -67,6 +69,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .utf8
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
new file mode 100644
index 000000000..1d5b6b300
--- /dev/null
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0-fix_install.patch
@@ -0,0 +1,19 @@
+--- trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am.ORI 2013-07-20 12:35:51.155931996 +0200
++++ trinity-kvpnc-14.0.0~pre118+1ae72fe0/src/Makefile.am 2013-07-20 12:37:49.601226585 +0200
+@@ -57,13 +57,13 @@
+
+
+ install-data-local:
+- $(mkinstalldirs) $(kde_appsdir)/
+- $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(kde_appsdir)/kvpnc.desktop
++ $(mkinstalldirs) $(xdg_appsdir)/
++ $(INSTALL_DATA) $(srcdir)/kvpnc.desktop $(xdg_appsdir)/kvpnc.desktop
+ $(mkinstalldirs) $(kde_datadir)/kvpnc/
+ $(INSTALL_DATA) $(srcdir)/kvpncui.rc $(kde_datadir)/kvpnc/kvpncui.rc
+ $(mkinstalldirs) $(kde_datadir)/kvpnc/
+ $(INSTALL_DATA) $(srcdir)/eventsrc $(kde_datadir)/kvpnc/eventsrc
+- $(INSTALL_DATA) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
++ $(INSTALL_SCRIPT) $(srcdir)/ping_check.sh $(kde_datadir)/kvpnc/ping_check.sh
+ $(INSTALL_DATA) $(srcdir)/newprofilewizard.png $(kde_datadir)/kvpnc/newprofilewizard.png
+ $(INSTALL_DATA) $(srcdir)/newprofilewizard_final.png $(kde_datadir)/kvpnc/newprofilewizard_final.png
+ # $(INSTALL_DATA) $(srcdir)/x-cisco.desktop $(kde_mimedir)/application/x-cisco.desktop
diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
index bad003d7a..60a9f80c9 100644
--- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec
+++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec
@@ -41,6 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch1: kvpnc-14.0.0-fix_install.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -65,6 +67,7 @@ It supports :
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .installdir
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -119,7 +122,7 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_bindir}/kvpnc
-%{tde_datadir}/applnk/kvpnc.desktop
+%{tde_tdeappdir}/kvpnc.desktop
%{tde_datadir}/apps/kvpnc/
%lang(de) %{tde_datadir}/doc/tde/HTML/de/kvpnc/
%lang(en) %{tde_datadir}/doc/tde/HTML/en/kvpnc/
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index a31543d45..72733522b 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -139,17 +139,17 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
-%{tde_bindir}/kpowersave
-%{tde_libdir}/libtdeinit_kpowersave.la
-%{tde_libdir}/libtdeinit_kpowersave.so
-%{tde_tdelibdir}/kpowersave.la
-%{tde_tdelibdir}/kpowersave.so
-%{tde_tdeappdir}/kpowersave.desktop
-%{tde_datadir}/apps/kpowersave/eventsrc
-%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
+%{tde_bindir}/tdepowersave
+%{tde_libdir}/libtdeinit_tdepowersave.la
+%{tde_libdir}/libtdeinit_tdepowersave.so
+%{tde_tdelibdir}/tdepowersave.la
+%{tde_tdelibdir}/tdepowersave.so
+%{tde_tdeappdir}/tdepowersave.desktop
+%{tde_datadir}/apps/tdepowersave/eventsrc
+%{tde_datadir}/apps/tdepowersave/icons/*/*/*/*.png
%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_datadir}/autostart/kpowersave-autostart.desktop
-%{tde_datadir}/config/kpowersaverc
+%{tde_datadir}/autostart/tdepowersave-autostart.desktop
+%{tde_datadir}/config/tdepowersaverc
%changelog
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index ee3aa97ec..a31156cc2 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -17,7 +17,7 @@
Name: trinity-libart-lgpl
Version: 2.3.22
-Release: 1%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: Library of functions for 2D graphics - runtime files
@@ -144,7 +144,7 @@ autoreconf -fiv
%build
-unset QTDIR
+unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
index 43cea02c4..abf387f10 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-pytdeextensions
Summary: Python packages to support TDE applications (scripts) [Trinity]
Version: 0.4.0
-Release: %{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -166,6 +166,7 @@ done
# Fix permissions on include files
%__chmod 644 %{?buildroot}%{tde_tdeincludedir}/*.h
+
%clean
%__rm -rf %{buildroot}
@@ -202,7 +203,10 @@ done
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-5
+- Initial build for TDE 14.0.0
+
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4
- Initial release for TDE 3.5.13.2
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
index 8eee09999..a63006a52 100644
--- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
+++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec
@@ -220,7 +220,7 @@ done
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
+* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.4.0-4
- Initial release for TDE 3.5.13.2
* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.0-3
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index ff58104d0..22303545a 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -33,7 +33,9 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+# Fix FTBFS
Patch0: tdelibs-14.0.0-ftbfs.patch
+# Fix categories in T-menu
Patch1: tdelibs-14.0.0-fix_xdg_menu.patch
# Fix battery charge detection
Patch2: tdelibs-14.0.0-fix_battery_charge.patch
@@ -43,9 +45,6 @@ Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch
-# Fix battery charge detection
-Patch3: tdelibs-14.0.0-fix_battery_charge.patch
-
Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release}
Obsoletes: trinity-kdelibs < %{version}-%{release}
@@ -108,10 +107,15 @@ BuildRequires: bzip2-devel
# UDEV support
BuildRequires: libudev-devel
-# UDISKS2 support
+# UDISKS support
+Requires: udisks
BuildRequires: udisks-devel
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+
+# UDISKS2 support
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_udisks2 1
+Requires: udisks2
+BuildRequires: udisks2-devel
%endif
# UTEMPTER support