diff options
Diffstat (limited to 'redhat/tdelibs/tdelibs-14.0.0.spec')
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 86 |
1 files changed, 48 insertions, 38 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 37d2bf0ff..8e0cbc920 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -31,7 +33,8 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz - +Patch0: tdelibs-14.0.0-ftbfs.patch +Patch1: tdelibs-14.0.0-fix_xdg_menu.patch Obsoletes: tdelibs < %{version}-%{release} Provides: tdelibs = %{version}-%{release} @@ -44,14 +47,13 @@ Provides: trinity-kdelibs-apidocs = %{version}-%{release} BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: trinity-tqt3-devel >= 3.5.0 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-dbus-1-tqt-devel >= %{version} -BuildRequires: trinity-dbus-tqt-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-dbus-1-tqt-devel >= %{tde_version} +BuildRequires: trinity-dbus-tqt-devel >= %{tde_version} BuildRequires: krb5-devel BuildRequires: libxslt-devel BuildRequires: cups-devel -BuildRequires: trinity-libart-lgpl-devel BuildRequires: openssl-devel BuildRequires: gcc-c++ BuildRequires: alsa-lib-devel @@ -61,6 +63,9 @@ BuildRequires: glib2-devel # LUA support are not ready yet #BuildRequires: lua-devel +# LIBART_LGPL support +BuildRequires: trinity-libart-lgpl-devel + # ASPELL support BuildRequires: aspell BuildRequires: aspell-devel @@ -90,6 +95,15 @@ BuildRequires: libbz2-devel BuildRequires: bzip2-devel %endif +# UDEV support +BuildRequires: libudev-devel + +# UDISKS2 support +BuildRequires: udisks-devel +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} +%define with_udisks2 1 +%endif + # UTEMPTER support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: libutempter-devel @@ -124,7 +138,7 @@ BuildRequires: jasper-devel # AVAHI support %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_avahi 1 -BuildRequires: trinity-avahi-tqt-devel >= %{version} +BuildRequires: trinity-avahi-tqt-devel >= %{tde_version} %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}avahi-client-devel Requires: %{_lib}avahi-client3 @@ -195,11 +209,14 @@ BuildRequires: xz-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}nm-util-devel %endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: NetworkManager-glib-devel +%endif %endif Requires: trinity-tqt3 >= 3.5.0 -Requires: trinity-tqtinterface >= %{version} -Requires: trinity-arts >= %{version} +Requires: trinity-tqtinterface >= %{tde_version} +Requires: trinity-arts >= %{tde_version} %description Libraries for the Trinity Desktop Environment: @@ -232,13 +249,13 @@ kimgio (image manipulation). %{tde_bindir}/tdecmshell %{tde_bindir}/tdeconf_update %{tde_bindir}/kcookiejar -%{tde_bindir}/[kt]de-config -%{tde_bindir}/[kt]de-menu +%{tde_bindir}/tde-config +%{tde_bindir}/tde-menu %{tde_bindir}/kded -%{tde_bindir}/[kt]deinit -%{tde_bindir}/[kt]deinit_shutdown -%{tde_bindir}/[kt]deinit_wrapper -%{tde_bindir}/[kt]desu_stub +%{tde_bindir}/tdeinit +%{tde_bindir}/tdeinit_shutdown +%{tde_bindir}/tdeinit_wrapper +%{tde_bindir}/tdesu_stub %{tde_bindir}/kdetcompmgr %{tde_bindir}/kdontchangethehostname %{tde_bindir}/tdedostartupconfig @@ -265,8 +282,8 @@ kimgio (image manipulation). %{tde_bindir}/make_driver_db_lpr %{tde_bindir}/meinproc %{tde_bindir}/networkstatustestservice -%{tde_bindir}/start_[kt]deinit -%{tde_bindir}/start_[kt]deinit_wrapper +%{tde_bindir}/start_tdeinit +%{tde_bindir}/start_tdeinit_wrapper %attr(4755,root,root) %{tde_bindir}/kgrantpty %{tde_bindir}/tde_dbus_hardwarecontrol %{tde_bindir}/checkXML @@ -275,9 +292,9 @@ kimgio (image manipulation). %{tde_bindir}/preparetips %{tde_tdelibdir}/* %{tde_libdir}/lib*.so.* -%{tde_libdir}/lib[kt]deinit_*.la -%{tde_libdir}/lib[kt]deinit_*.so -%{tde_datadir}/applications/[kt]de/*.desktop +%{tde_libdir}/libtdeinit_*.la +%{tde_libdir}/libtdeinit_*.so +%{tde_datadir}/applications/tde/*.desktop %{tde_datadir}/autostart/tdeab2tdeabc.desktop %{tde_datadir}/applnk/tdeio_iso.desktop %{tde_datadir}/apps/* @@ -296,7 +313,8 @@ kimgio (image manipulation). %{tde_tdedocdir}/HTML/en/tdespell/ %{_sysconfdir}/dbus-1/system.d/org.trinitydesktop.hardwarecontrol.conf -%{tde_prefix}/etc/xdg/menus/tde-applications.menu +%{_sysconfdir}/xdg/menus/tde-applications.menu +%{_sysconfdir}/xdg/menus/tde-applications.menu-no-kde %{_sysconfdir}/ld.so.conf.d/trinity.conf %{_datadir}/dbus-1/system-services/org.trinitydesktop.hardwarecontrol.service @@ -333,16 +351,16 @@ applications for TDE. %defattr(-,root,root,-) %{tde_bindir}/dcopidl* %{tde_bindir}/*config_compiler -%{tde_bindir}/make[kt]dewidgets +%{tde_bindir}/maketdewidgets %{tde_datadir}/apps/ksgmltools2/ %{tde_tdeincludedir}/* %{tde_libdir}/*.la %{tde_libdir}/*.so %{tde_libdir}/*.a %{tde_libdir}/pkgconfig/tdelibs.pc -%exclude %{tde_libdir}/lib[kt]deinit_*.la -%exclude %{tde_libdir}/lib[kt]deinit_*.so -%{tde_datadir}/cmake/[kt]delibs.cmake +%exclude %{tde_libdir}/libtdeinit_*.la +%exclude %{tde_libdir}/libtdeinit_*.so +%{tde_datadir}/cmake/tdelibs.cmake %post devel /sbin/ldconfig || : @@ -360,6 +378,8 @@ applications for TDE. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs +%patch1 -p1 -b .xdg %build @@ -409,7 +429,7 @@ cd build %{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \ -DWITH_UPOWER=ON \ -DWITH_UDISKS=ON \ - -DWITH_UDISKS2=ON \ + %{?with_udisks2:-DWITH_UDISKS2=ON} %{?!with_udisks2:-DWITH_UDISKS2=OFF} \ -DWITH_CONSOLEKIT=ON \ %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \ -DWITH_SUDO_TDESU_BACKEND=OFF \ @@ -433,16 +453,6 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf" EOF %endif -# Moves the XDG configuration files to TDE directory -%if "%{tde_prefix}" != "/usr" -%__install -p -D -m644 \ - "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \ - "%{?buildroot}%{tde_prefix}/etc/xdg/menus/tde-applications.menu" -%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg" -%else -%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/tde-applications.menu" -%endif - # Appends TDE version to '.pc' file echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc" @@ -452,5 +462,5 @@ echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc" %changelog -* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 -- Initial build for TDE R14, using 'tqt3' instead of 'qt3' +* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE 14.0.0 |