diff options
Diffstat (limited to 'redhat/applications/basket')
-rw-r--r-- | redhat/applications/basket/basket-3.5.13.2.spec | 157 | ||||
-rw-r--r-- | redhat/applications/basket/basket.spec (renamed from redhat/applications/basket/basket-14.0.0.spec) | 62 |
2 files changed, 32 insertions, 187 deletions
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec deleted file mode 100644 index c392dea83..000000000 --- a/redhat/applications/basket/basket-3.5.13.2.spec +++ /dev/null @@ -1,157 +0,0 @@ -# Default version for this component -%define tde_pkg basket -%define tde_version 3.5.13.2 - -# 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_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: Taking care of your ideas. -Version: 1.0.3.1 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= %{tde_version} -BuildRequires: trinity-arts-devel >= 1:1.5.10 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: trinity-tdepim-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -BuildRequires: gpgme-devel - -%description -This application is mainly an all-purpose notes taker. It provide several baskets where -to drop every sort of items: text, rich text, links, images, sounds, files, colors, -application launcher... Objects can be edited, copied, dragged... So, you can arrange -them as you want ! This application can be used to quickly drop web objects (link, text, -images...) or notes, as well as to free your clutered desktop (if any). It is also useful -to collect informations for a report. Those data can be shared with co-workers by exporting -baskets to HTML. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{tde_pkg} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - -%postun -for f in crystalsvg ; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done -/sbin/ldconfig -update-desktop-database %{tde_tdeappdir} -q &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/basket -%{tde_tdeappdir}/basket.desktop -%{tde_datadir}/apps/basket/ -%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg -%{tde_libdir}/libbasketcommon.la -%{tde_libdir}/libbasketcommon.so -%{tde_tdelibdir}/basketthumbcreator.la -%{tde_tdelibdir}/basketthumbcreator.so -%{tde_tdelibdir}/kcm_basket.la -%{tde_tdelibdir}/kcm_basket.so -%{tde_tdelibdir}/libbasketpart.la -%{tde_tdelibdir}/libbasketpart.so -%{tde_tdelibdir}/libkontact_basket.la -%{tde_tdelibdir}/libkontact_basket.so -%{tde_datadir}/config/magic/basket.magic -%{tde_datadir}/icons/crystalsvg/*/*/* -%{tde_datadir}/mimelnk/application/x-basket-archive.desktop -%{tde_datadir}/mimelnk/application/x-basket-template.desktop -%{tde_datadir}/services/basket_config_apps.desktop -%{tde_datadir}/services/basket_config_baskets.desktop -%{tde_datadir}/services/basket_config_features.desktop -%{tde_datadir}/services/basket_config_general.desktop -%{tde_datadir}/services/basket_config_new_notes.desktop -%{tde_datadir}/services/basket_config_notes.desktop -%{tde_datadir}/services/basket_config_notes_appearance.desktop -%{tde_datadir}/services/basket_part.desktop -%{tde_datadir}/services/basketthumbcreator.desktop -%{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop -%{tde_tdedocdir}/HTML/en/basket/ - - -%changelog diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket.spec index 66138fcdb..99cc3f21b 100644 --- a/redhat/applications/basket/basket-14.0.0.spec +++ b/redhat/applications/basket/basket.spec @@ -18,7 +18,7 @@ # TDE variables %define tde_epoch 2 %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif %define tde_pkg basket %define tde_prefix /opt/trinity @@ -60,11 +60,12 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdepim-devel >= %{tde_version} +BuildRequires: trinity-kontact-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gpgme-devel -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: libtool @@ -100,40 +101,43 @@ baskets to HTML. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export kde_confdir="%{tde_confdir}" - -# Warning: --enable-final causes FTBFS -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" + +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ + -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --disable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS="ON" \ + .. -%__make %{?_smp_mflags} || %__make +%__make %{?_smp_mflags} %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %find_lang %{tde_pkg} @@ -168,23 +172,21 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" %{tde_tdelibdir}/libbasketpart.so %{tde_tdelibdir}/libkontact_basket.la %{tde_tdelibdir}/libkontact_basket.so -%{tde_confdir}/magic/basket.magic +%config(noreplace) %{tde_confdir}/magic/basket.magic %{tde_datadir}/icons/crystalsvg/*/*/* %{tde_datadir}/mimelnk/application/x-basket-archive.desktop %{tde_datadir}/mimelnk/application/x-basket-template.desktop %{tde_datadir}/services/basket_config_apps.desktop %{tde_datadir}/services/basket_config_baskets.desktop -#%{tde_datadir}/services/basket_config_features.desktop %{tde_datadir}/services/basket_config_general.desktop %{tde_datadir}/services/basket_config_new_notes.desktop -#%{tde_datadir}/services/basket_config_notes.desktop %{tde_datadir}/services/basket_config_notes_appearance.desktop %{tde_datadir}/services/basket_part.desktop %{tde_datadir}/services/basketthumbcreator.desktop %{tde_datadir}/services/kontact/basket.desktop -%{tde_datadir}/services/kontact/basket_v4.desktop %{tde_tdedocdir}/HTML/en/basket/ -%{tde_confdir}/magic/basket.magic.mgc +%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc +%{tde_mandir}/man1/basket.* %changelog |