RPM: switch kopete-otr, ktechlab, qalculate-tde and twin-style-crystal to cmake build

pull/158/head
François Andriot 3 years ago
parent db8d6a2a2c
commit 503a3d9b48

@ -68,7 +68,7 @@ BuildRequires: trinity-tdenetwork-devel >= %{tde_version}
# Kopete is provided by tdenetwork # Kopete is provided by tdenetwork
Requires: trinity-kopete >= %{tde_version} Requires: trinity-kopete >= %{tde_version}
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -104,39 +104,46 @@ users with IM-Cients supporting the OTR encryption method.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
--prefix=%{tde_prefix} \ if ! rpm -E %%cmake|grep -q "cd build"; then
--exec-prefix=%{tde_prefix} \ %__mkdir_p build
--bindir=%{tde_bindir} \ cd build
--datadir=%{tde_datadir} \ fi
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -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 \
\
-DCMAKE_LIBRARY_PATH=%{tde_libdir} \
-DKOPETE_INCLUDE_DIR=%{tde_tdeincludedir}/kopete \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DWITH_ALL_OPTIONS=ON \
--enable-new-ldflags \ ..
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
# Unwanted files # Unwanted files
%__rm -f %{?buildroot}%{tde_libdir}/libkotr.so %__rm -f %{?buildroot}%{tde_libdir}/libkotr.so

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -101,47 +101,44 @@ Homepage: http://ktechlab.org/
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-final causes FTBFS if ! rpm -E %%cmake|grep -q "cd build"; then
%configure \ %__mkdir_p build
--prefix=%{tde_prefix} \ cd build
--exec-prefix=%{tde_prefix} \ fi
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \ %cmake \
--libdir=%{tde_libdir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--mandir=%{tde_mandir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
--includedir=%{tde_tdeincludedir} \ -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 \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DWITH_ALL_OPTIONS=ON \
--disable-final \ -DWITH_GPSIM=OFF \
--enable-new-ldflags \ ..
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
%__mkdir_p "%{?buildroot}%{tde_tdeappdir}"
%__mv -f "%{?buildroot}%{tde_datadir}/applnk/Development/ktechlab.desktop" "%{?buildroot}%{tde_tdeappdir}"
%__rm -rf "%{?buildroot}%{tde_datadir}/applnk"
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file -r -n ktechlab Science Math %suse_update_desktop_file -r -n ktechlab Science Math
@ -166,6 +163,8 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/mimelnk/application/x-flowcode.desktop %{tde_datadir}/mimelnk/application/x-flowcode.desktop
%{tde_datadir}/mimelnk/application/x-ktechlab.desktop %{tde_datadir}/mimelnk/application/x-ktechlab.desktop
%{tde_datadir}/mimelnk/application/x-microbe.desktop %{tde_datadir}/mimelnk/application/x-microbe.desktop
%{tde_mandir}/man1/ktechlab.1*
%{tde_mandir}/man1/microbe.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libtool BuildRequires: libtool
@ -109,32 +109,32 @@ This package contains the TDE user interface of qalculate.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
if ! rpm -E %%cmake|grep -q "cd build"; then
%configure \ %__mkdir_p build
--prefix=%{tde_prefix} \ cd build
--exec-prefix=%{tde_prefix} \ fi
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--libdir=%{tde_libdir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
--mandir=%{tde_mandir} \ -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 \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\ \
--disable-dependency-tracking \ -DBUILD_ALL=ON \
--disable-debug \ -DWITH_ALL_OPTIONS=ON \
--enable-new-ldflags \ ..
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
@ -142,7 +142,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%find_lang qalculate_tde %find_lang qalculate_tde
@ -158,13 +158,13 @@ export PATH="%{tde_bindir}:${PATH}"
%files -f qalculate_tde.lang %files -f qalculate_tde.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/qalculate
%{tde_bindir}/qalculate-tde %{tde_bindir}/qalculate-tde
%{tde_datadir}/apps/qalculate_tde/ %{tde_datadir}/apps/qalculate_tde/
%{tde_tdeappdir}/qalculate_tde.desktop %{tde_tdeappdir}/qalculate_tde.desktop
%{tde_tdedocdir}/HTML/en/qalculate_tde/ %{tde_tdedocdir}/HTML/en/qalculate_tde/
%{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png %{tde_datadir}/icons/hicolor/*/apps/qalculate_tde.png
%{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png %{tde_datadir}/icons/hicolor/*/actions/qalculate_convert.png
%{tde_mandir}/man1/qalculate-tde.1*
%changelog %changelog

@ -61,7 +61,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gettext BuildRequires: gettext
BuildRequires: autoconf automake libtool m4 BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: fdupes BuildRequires: fdupes
@ -100,40 +100,40 @@ And it is of course nice to look at. Upstream says:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %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 %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-gcc-visibility makes decoration unusable. if ! rpm -E %%cmake|grep -q "cd build"; then
%configure \ %__mkdir_p build
--prefix=%{tde_prefix} \ cd build
--exec-prefix=%{tde_prefix} \ fi
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \ %cmake \
--includedir=%{tde_tdeincludedir} \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
--libdir=%{tde_libdir} \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
--mandir=%{tde_mandir} \ -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 \ -DBUILD_ALL=ON \
--disable-debug \ -DWITH_ALL_OPTIONS=ON \
--enable-final \ ..
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot} -C build
%clean %clean

Loading…
Cancel
Save