From a44981b5eca2dbf39fa66fd0fa33eef8cae47a1f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Nov 12 2011 00:05:22 +0000 Subject: switch to the better way of doing dual builds that I used in libindicator --- diff --git a/bamf.spec b/bamf.spec index cfde469..7a4e9a7 100644 --- a/bamf.spec +++ b/bamf.spec @@ -1,7 +1,7 @@ Summary: Application matching framework Name: bamf Version: 0.2.104 -Release: 1%{?dist} +Release: 2%{?dist} # Library bits are LGPLv2 or LGPLv3 (but not open-ended LGPLv2+); # non-lib bits are GPLv3. # pbrobinson points out that three files in the lib are actually @@ -79,26 +79,25 @@ developing applications that use %{name} (GTK+ 3 build). %prep %setup -q -pushd %{_builddir} -cp -R %{name}-%{version} %{name}-%{version}-gtk3 -popd %build -%configure --disable-static --with-gtk=2 +%global _configure ../configure +rm -rf build-gtk3 build-gtk2 +mkdir build-gtk3 build-gtk2 +pushd build-gtk2 +%configure --disable-static --with-gtk=2 --enable-gtk-doc make %{?_smp_mflags} - -pushd %{_builddir}/%{name}-%{version}-gtk3 -%configure --disable-static --with-gtk=3 +popd +pushd build-gtk3 +%configure --disable-static --with-gtk=3 --enable-gtk-doc make %{?_smp_mflags} popd %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install -pushd %{_builddir}/%{name}-%{version}-gtk3 -make DESTDIR=%{buildroot} install -popd +make -C build-gtk2 DESTDIR=%{buildroot} install +make -C build-gtk3 DESTDIR=%{buildroot} install find %{buildroot} -regex ".*\.la$" | xargs rm -f --