From eaa27cfab10809dface087064bb55281502c8336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 22 Jul 2013 14:38:31 +0200 Subject: RPM Packaging: updates for R14 --- redhat/applications/amarok/amarok-14.0.0.spec | 2 +- .../kdbusnotification-3.5.13.2.spec | 8 +- .../knetworkmanager8/knetworkmanager-14.0.0.spec | 193 --------------------- .../knetworkmanager8/knetworkmanager8-14.0.0.spec | 183 +++++++++++++++++++ 4 files changed, 191 insertions(+), 195 deletions(-) delete mode 100644 redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec create mode 100644 redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec (limited to 'redhat/applications') 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 - 0.1-4.1 +- Fix UTF8 messages + * Mon Jun 03 2013 Francois Andriot - 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/knetworkmanager-14.0.0.spec deleted file mode 100644 index 73930db63..000000000 --- a/redhat/applications/knetworkmanager8/knetworkmanager-14.0.0.spec +++ /dev/null @@ -1,193 +0,0 @@ -# Default version for this component -%define tde_pkg knetworkmanager -%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" -%define _variant .opt -%endif - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_tdedocdir} - - -Name: trinity-%{tde_pkg} -Version: %{?version} -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} - -Summary: Trinity applet for Network Manager - -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 -BuildRequires: desktop-file-utils - -%if 0%{?rhel} || 0%{?fedora} -Requires: NetworkManager-gnome -%else -Requires: networkmanager -%endif - -BuildRequires: trinity-dbus-1-tqt-devel -BuildRequires: trinity-dbus-tqt-devel -BuildRequires: NetworkManager-glib-devel - -%description -KNetworkManager is a system tray applet for controlling network -connections on systems that use the NetworkManager daemon. - - -%package devel -Summary: Common data shared among the MySQL GUI Suites -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -Development headers for knetworkmanager - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%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}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}" -export LD_LIBRARY_PATH="%{tde_libdir}" - -# Missing TDE macros -%__mkdir_p cmake -%__ln_s %{tde_datadir}/cmake cmake/modules - -%if 0%{?rhel} || 0%{?fedora} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ - .. - -%__make %{?_smp_mflags} - -%install -%__rm -rf $RPM_BUILD_ROOT -%__make install DESTDIR=%{?buildroot} -C build - - -%clean -%__rm -rf $RPM_BUILD_ROOT - - -%post -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 || : - -%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 -%{tde_libdir}/*.la -%{tde_libdir}/*.so -%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf -%{tde_tdeappdir}/knetworkmanager.desktop -%{tde_datadir}/apps/knetworkmanager -%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager* -%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop -%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop - - -%files devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_tdelibdir}/*.la -%{tde_tdelibdir}/*.so - -%changelog -* Fri Jul 05 2013 Francois Andriot - %{?version}-6 -- Initial release for TDE 14.0.0 - -* Mon Jun 03 2013 Francois Andriot - %{?version}-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot - %{?version}-4 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot - 0.8-3 / 0.9-3 -- Rebuild for Fedora 17 - -* Sat Nov 13 2011 Francois Andriot - 0.8-2 / 0.9-2 -- Remove faulty patch for WPA authentication - -* Tue Nov 11 2011 Francois Andriot - 0.8-1 / 0.9-1 -- Initial release diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec new file mode 100644 index 000000000..2cfd123e8 --- /dev/null +++ b/redhat/applications/knetworkmanager8/knetworkmanager8-14.0.0.spec @@ -0,0 +1,183 @@ +# Default version for this component +%define tde_pkg knetworkmanager8 +%define tde_version 14.0.0 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/tde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_tdedocdir} + + +Name: trinity-%{tde_pkg} +Version: 0.8 +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} + +Summary: Trinity applet for Network Manager + +Group: Applications/Internet +License: GPLv2+ +URL: http://en.opensuse.org/Projects/KNetworkManager + +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz + +Patch0: knetworkmanager-3.5.13-missing_includes.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +#Requires: kde-filesystem +BuildRequires: desktop-file-utils + +%if 0%{?rhel} || 0%{?fedora} +Requires: NetworkManager-gnome +%else +Requires: networkmanager +%endif + +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. + + +%package devel +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 + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} + +cd knetworkmanager-0.*/src +%patch0 -p3 + + +%build +unset QTDIR QTINC QTLIB +export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{tde_includedir}" +export LD_LIBRARY_PATH="%{tde_libdir}" + +# Missing TDE macros +%__mkdir_p cmake +%__ln_s %{tde_datadir}/cmake cmake/modules + +%if 0%{?rhel} || 0%{?fedora} +%__mkdir_p build +cd build +%endif + +%cmake \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCMAKE_SKIP_RPATH="OFF" \ + .. + +%__make %{?_smp_mflags} || %__make + + +%install +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=%{?buildroot} -C build + + +%clean +%__rm -rf $RPM_BUILD_ROOT + + +%post +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 || : + + +%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 +%{tde_libdir}/*.la +%{tde_libdir}/*.so +%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf +%{tde_tdeappdir}/knetworkmanager.desktop +%{tde_datadir}/apps/knetworkmanager +%{tde_datadir}/icons/hicolor/*/apps/knetworkmanager* +%{tde_datadir}/servicetypes/knetworkmanager_plugin.desktop +%{tde_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop + + +%files devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_tdelibdir}/*.la +%{tde_tdelibdir}/*.so + +%changelog +* Fri Jul 05 2013 Francois Andriot - %{?version}-6 +- Initial release for TDE 14.0.0 + +* Mon Jun 03 2013 Francois Andriot - %{?version}-5 +- Initial release for TDE 3.5.13.2 + +* Wed Oct 03 2012 Francois Andriot - %{?version}-4 +- Initial release for TDE 3.5.13.1 + +* Wed May 02 2012 Francois Andriot - 0.8-3 / 0.9-3 +- Rebuild for Fedora 17 + +* Sat Nov 13 2011 Francois Andriot - 0.8-2 / 0.9-2 +- Remove faulty patch for WPA authentication + +* Tue Nov 11 2011 Francois Andriot - 0.8-1 / 0.9-1 +- Initial release -- cgit v1.2.1