summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-31 10:52:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-31 10:52:13 +0200
commita3b862075dfb95d407dba59baf28212a7faac0e2 (patch)
treec070f5d67d7bc7abd66e6ef55f5b6a3f6064e692
parent0f108a5d0ad95ba3591af576e6dd6a683f69789b (diff)
downloadtde-packaging-a3b862075dfb95d407dba59baf28212a7faac0e2.tar.gz
tde-packaging-a3b862075dfb95d407dba59baf28212a7faac0e2.zip
RPM Packaging: update kdbusnotification
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec19
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch (renamed from redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch)0
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec2
3 files changed, 14 insertions, 7 deletions
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
index f4e8b815f..7836a2311 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-14.0.0.spec
@@ -28,7 +28,7 @@ Name: trinity-%{tde_pkg}
Summary: a DBUS notification service [Trinity]
Version: 0.1
-Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -42,8 +42,6 @@ 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}
@@ -69,7 +67,6 @@ 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"
@@ -88,8 +85,15 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
--disable-rpath \
- --enable-closure
+ \
+ --with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
@@ -114,9 +118,12 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-6
- Initial release for TDE 14.0.0
+* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-5
+- Fix UTF8 messages
+
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
- Initial release for TDE 3.5.13.2
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
index 4ed8c1c52..4ed8c1c52 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-14.0.0-fix_utf8.patch
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2-fix_utf8.patch
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index c76b84f2b..d371d5669 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -42,7 +42,7 @@ 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
+Patch1: kdbusnotification-3.5.13.2-fix_utf8.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version}