summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:20:57 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:24:18 +0200
commit4d6d012c4b9762f1a9e51dc6d9199d945c15998d (patch)
tree54f21da5e6a95da96f11cca8de0836dd34b99a18 /redhat
parent3a5369c318ff3e4f687110bc10abc7beca1eb1a5 (diff)
downloadtde-packaging-4d6d012c4b9762f1a9e51dc6d9199d945c15998d.tar.gz
tde-packaging-4d6d012c4b9762f1a9e51dc6d9199d945c15998d.zip
RPM: update bibletime
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat')
-rw-r--r--redhat/applications/misc/bibletime/bibletime.spec69
1 files changed, 30 insertions, 39 deletions
diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index 4ecd291ea..872078156 100644
--- a/redhat/applications/misc/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -64,7 +64,7 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: libtool
@@ -114,53 +114,44 @@ texts, write own notes, save, print etc.).
%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 PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-CXXFLAGS="${RPM_OPT_FLAGS} -std=c++11"
-%endif
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
+ \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+ -DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --enable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
+ -DWITH_ALL_OPTIONS=ON \
+ -DBUILD_ALL=ON \
+ ..
+
%__make %{?_smp_mflags} || %__make
%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
-
-echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
%clean