diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-02-03 16:32:40 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-02-03 16:51:34 +0100 |
| commit | 20f4adb3d30c07a251175bd6bf9c4b0dfeb4125c (patch) | |
| tree | ad4c3861a2afc743dd5b02e7911426908da07b2d /redhat/applications/twin-style-crystal | |
| parent | 5b58ce0a4a818f61e077efaba45358c327c847bd (diff) | |
| download | tde-packaging-20f4adb3d30c07a251175bd6bf9c4b0dfeb4125c.tar.gz tde-packaging-20f4adb3d30c07a251175bd6bf9c4b0dfeb4125c.zip | |
RPM: switch kopete-otr, ktechlab, qalculate-tde and twin-style-crystal to cmake build
Diffstat (limited to 'redhat/applications/twin-style-crystal')
| -rw-r--r-- | redhat/applications/twin-style-crystal/twin-style-crystal.spec | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index 82d5534e4..f595966a2 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: autoconf automake libtool m4 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: fdupes @@ -100,40 +100,40 @@ And it is of course nice to look at. Upstream says: %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}" -# Warning: --enable-gcc-visibility makes decoration unusable. -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ +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}" \ + -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=ON \ + \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-final \ - --enable-new-ldflags \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + .. -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean |