summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec2
-rw-r--r--redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec8
-rw-r--r--redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec (renamed from redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec)38
3 files changed, 22 insertions, 26 deletions
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index dfb0ace2a..d12f8bcef 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -126,7 +126,7 @@ BuildRequires: libvisual-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel
%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: libtunepimp-devel
%endif
diff --git a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
index 3357790a1..c1fa65c21 100644
--- a/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
+++ b/redhat/applications/kdbusnotification/kdbusnotification-3.5.13.2.spec
@@ -27,7 +27,7 @@ Name: trinity-%{kdecomp}
Summary: a DBUS notification service [Trinity]
Version: 0.1
-Release: 4%{?dist}%{?_variant}
+Release: 4.1%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -41,6 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-3.5.13.2.tar.gz
+Patch1: kdbusnotification-14.0.0-fix_utf8.patch
+
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
BuildRequires: trinity-arts-devel >= 3.5.13.2
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
@@ -66,6 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep
%setup -q -n %{name}-3.5.13.2
+%patch1 -p1 -b .utf8
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -117,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog
+* Sun Jul 21 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4.1
+- 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/knetworkmanager8/knetworkmanager-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
index 73930db63..2cfd123e8 100644
--- a/redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec
+++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec
@@ -1,11 +1,6 @@
# Default version for this component
-%define tde_pkg knetworkmanager
+%define tde_pkg knetworkmanager8
%define tde_version 14.0.0
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
-%define version 0.9
-%else
-%define version 0.8
-%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
@@ -30,7 +25,7 @@
Name: trinity-%{tde_pkg}
-Version: %{?version}
+Version: 0.8
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity applet for Network Manager
@@ -39,17 +34,10 @@ Group: Applications/Internet
License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager
-%if "%{?version}" == "0.9"
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-%else
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-%endif
Patch0: knetworkmanager-3.5.13-missing_includes.patch
-# For knetworkmanager 0.9 only !
-Patch10: knetworkmanager-3.5.13-subdir_version.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: kde-filesystem
@@ -65,6 +53,9 @@ BuildRequires: trinity-dbus-1-tqt-devel
BuildRequires: trinity-dbus-tqt-devel
BuildRequires: NetworkManager-glib-devel
+Obsoletes: trinity-knetworkmanager < %{version}-%{release}
+Provides: trinity-knetworkmanager = %{version}-%{release}
+
%description
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
@@ -75,6 +66,9 @@ Summary: Common data shared among the MySQL GUI Suites
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release}
+Provides: trinity-knetworkmanager-devel = %{version}-%{release}
+
%description devel
Development headers for knetworkmanager
@@ -85,21 +79,12 @@ Development headers for knetworkmanager
%prep
-%if "%{?version}" == "0.9"
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%else
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%endif
-
-%if "%{?version}" == "0.9"
-%patch10 -p1
-%endif
cd knetworkmanager-0.*/src
%patch0 -p3
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
@@ -125,7 +110,8 @@ cd build
-DCMAKE_SKIP_RPATH="OFF" \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
+
%install
%__rm -rf $RPM_BUILD_ROOT
@@ -142,18 +128,22 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%postun
update-desktop-database %{tde_appdir} > /dev/null
/sbin/ldconfig
touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
%post devel
/sbin/ldconfig
+
%postun devel
/sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%{tde_bindir}/knetworkmanager