[barry/f14/master] Cleaned specfile - removed un-needed conditionals

[Nathanael Noblet]

commit fc1fef9292e2c9e0587e4f273b07c82d12589756
Author: Nathanael d. Noblet <nathanael at gnat.ca>
Date:   Thu Aug 5 07:59:30 2010 -0600

    Cleaned specfile - removed un-needed conditionals

 barry.spec |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/barry.spec b/barry.spec
index 0505be2..66080ff 100644
--- a/barry.spec
+++ b/barry.spec
@@ -1,10 +1,3 @@
-# Fedora <= 8 & ==11 currently supports opensync 0.22
-%if 0%{?fc9}%{?fc10}
-     %define with_opensync 0
-%else
-     %define with_opensync 1
-%endif
-
 Name:           barry
 Version:        0.17
 Release:        0.3.20100730git%{?dist}
@@ -56,15 +49,12 @@ This package contains the development library files for Barry, barry-libs.
 %package devel-docs
 Summary: BlackBerry Desktop for Linux - development libraries documentation
 Group: Development/Libraries
-%if 0%{?fedora} >= 10
 BuildArch: noarch
-%endif
 
 %description devel-docs
 This package contains the documentation for the development library files for
 Barry.
 
-%if %{with_opensync}
 %package opensync
 Summary: BlackBerry Desktop for Linux - opensync plugin
 Group: Applications/Productivity
@@ -73,7 +63,6 @@ Requires: libopensync = 1:0.22
 
 %description opensync
 This package contains the opensync plugin to synchronize your BlackBerry.
-%endif
 
 %prep
 %setup -q
@@ -97,14 +86,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 cd ../
 
 # opensync tree
-%if %{with_opensync}
 cd opensync-plugin/
 %{configure} PKG_CONFIG_PATH="..:$PKG_CONFIG_PATH" CXXFLAGS="-I../.." LDFLAGS="-L../../src"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 cd ../
-%endif
 
 %install
 # main tree
@@ -139,11 +126,9 @@ install -p -m 0644 ../logo/barry_logo_icon.png %{buildroot}%{_datadir}/icons/hic
 cd ../
 
 # opensync tree
-%if %{with_opensync}
 cd opensync-plugin/
 %{__make} DESTDIR=%{buildroot} install
 cd ../
-%endif
 
 %{__rm} -rf %{buildroot}%{_libdir}/opensync/plugins/*.la
 %{__rm} -rf %{buildroot}%{_libdir}/*.la
@@ -182,13 +167,11 @@ cd ../
 %defattr(-,root,root)
 %doc COPYING doc/*
 
-%if %{with_opensync}
 %files opensync
 %defattr(-,root,root)
 %{_libdir}/opensync/plugins/*
 %{_datadir}/opensync/defaults/*
 %doc COPYING
-%endif
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -210,6 +193,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Aug 05 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.4.20100730git
+- Removed un-needed specfile conditionals
+
 * Thu Jul 29 2010 Nathanael Noblet <nathanael at gnat.ca> - 0.3.20100730git
 - Rebuilt against new boost