diff --git a/kde-filesystem.spec b/kde-filesystem.spec index 19ea585d3363e521af92717a37677a95653ddd97..3fb14863b8d88fc3d8adfec270c90aa22d50bb69 100644 --- a/kde-filesystem.spec +++ b/kde-filesystem.spec @@ -19,7 +19,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 5 -Release: 1 +Release: 2 License: Public Domain @@ -49,16 +49,11 @@ Summary: Filesystem and RPM macros for KDE 4 License: Public Domain Provides: kde4-macros(api) = %{_kde4_macros_api} Requires: %{name} = %{version}-%{release} +Requires: cmake-rpm-macros %description -n kde4-filesystem This package provides some directories that are required/used by KDE 4 applications. - -%prep - -%build - - %install ## KDE4 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \ @@ -146,6 +141,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/solid/{actions,devices} %{_kde4_prefix}/%{_lib}/kde4/ %changelog +* Mon Jan 27 2025 Funda Wang - 5-2 +- change macro defination according to cmake + * Tue Jan 02 2024 Paul Thomas - 5-1 - update to version 5-1 diff --git a/macros.kde4 b/macros.kde4 index df828120dd686418f9555effa3cf3fc3d3a60771..28ec69895702d55d52a7d812141899fee96974de 100644 --- a/macros.kde4 +++ b/macros.kde4 @@ -11,11 +11,10 @@ %cmake_kde4 \ QTDIR="%{_qt4_prefix}" ; export QTDIR ; \ PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \ - CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ - %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ + %{set_build_flags} \ %{__cmake} \\\ + -S "%{_vpath_srcdir}" \\\ + -B "%{__cmake_builddir}" \\\ -DBUILD_SHARED_LIBS:BOOL=ON \\\ -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\