[osmo] Conditionalize, fix FTBFS.
Jon Ciesla
limb at fedoraproject.org
Tue Apr 30 17:13:27 UTC 2013
commit d5b5f44a436fbda365ac4cf7a7b9a51a5109dc6f
Author: Jon Ciesla <limburgher at gmail.com>
Date: Tue Apr 30 12:09:24 2013 -0500
Conditionalize, fix FTBFS.
osmo.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/osmo.spec b/osmo.spec
index ed02966..f749f6d 100644
--- a/osmo.spec
+++ b/osmo.spec
@@ -1,8 +1,12 @@
+%if (0%{?fedora} && 0%{?fedora}) < 19
+%global with_desktop_vendor_tag 1
+%endif
+
# 'rel' is always the release number.
# If you're building from SVN, set 'svn' to the SVN revision. If not, set it to 0.
%global rel 3
%global svn 924
-%if %svn
+%if %{svn}
# svn co https://osmo-pim.svn.sourceforge.net/svnroot/osmo-pim/trunk osmo-pim
# tar cvJf osmo-%{svn}.tar.xz osmo-pim/ --exclude=".svn*"
%global release 0.%{rel}.svn%{svn}%{?dist}.1
@@ -76,7 +80,7 @@ viele Parameter einstellen, um die Vorlieben des Benutzers zu treffen.
%prep
-%setup -q -n %{dirname}
+%setup -q -n osmo-pim
%patch0 -p1 -b .configure
%patch10 -p1 -b .aplay
autoreconf -i
@@ -103,7 +107,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/
%find_lang %{name}
-desktop-file-install --delete-original \
+desktop-file-install \
+%if %{with_desktop_vendor_tag}
+ --vendor fedora \
+%endif
+ --delete-original \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
@@ -139,6 +147,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Tue Apr 30 2013 Jon Ciesla <limburgher at gmail.com> - 0.2.12-0.3.svn924.1
- Drop desktop vendor tag.
+- De-macro'd setup to paper-over FTBFS.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.12-0.2.svn924.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list