From 105b843081d351072bd808b45de7b5af04622dc8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 08 2015 21:04:04 +0000 Subject: Modernize spec file for current rpmbuild Drop spec file constructs that are no longer needed with current rpmbuild. --- diff --git a/darktable.spec b/darktable.spec index 01b9499..369cc1b 100644 --- a/darktable.spec +++ b/darktable.spec @@ -19,8 +19,6 @@ Source0: %{name}-%{version}-nopatents.tar.xz # ./dartabke-generate-nopatents-tarball.sh Source1: darktable-generate-nopatents-tarball.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: cmake BuildRequires: pkgconfig >= 0.22 BuildRequires: intltool, gettext @@ -66,7 +64,7 @@ It also enables you to develop raw images and enhance them. %prep -%setup -q -n %{name}-%{version} +%setup -q # This is a little hacky, but it ensures we're building against the opencl system headers rm -rf src/external/CL/*.h* @@ -93,7 +91,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 pushd %{_target_platform} make install DESTDIR=%{buildroot} @@ -107,11 +104,6 @@ rm tools/noise/Makefile cp tools/noise/* %{buildroot}%{_datadir}/darktable/tools/noise/ -%clean -rm -rf %{buildroot} - -%pre - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -125,10 +117,7 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%preun - %files -f %{name}.lang -%defattr(-,root,root,-) %doc doc/README doc/AUTHORS doc/LICENSE doc/TRANSLATORS %{_bindir}/darktable %{_bindir}/darktable-cli @@ -146,6 +135,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Tue Sep 08 2015 Kalev Lember - 1.6.8-1 - Update to 1.6.8 +- Modernize spec file for current rpmbuild * Tue Jul 7 2015 Tom Callaway - 1.6.7-4 - unbundle opencl headers (and use system opencl headers)