rpms/libopensync/devel libopensync.spec,1.28,1.29

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libopensync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3935

Modified Files:
	libopensync.spec 
Log Message:
* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.36-8
- dynamically set SWIG_DIR



Index: libopensync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libopensync.spec	25 Feb 2009 16:54:05 -0000	1.28
+++ libopensync.spec	6 Mar 2009 18:40:39 -0000	1.29
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Name:           libopensync
 Version:        0.36
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
@@ -19,6 +19,10 @@
 BuildRequires:  pkgconfig
 BuildRequires:  cmake
 
+# FIXME: make FindSWIG.cmake "just work", 
+# instead of having to manually specify SWIG_DIR
+%global swig_version %((swig -version || echo "SWIG Version" 1.3.35) | grep ^SWIG | cut -d' ' -f3)
+
 %description
 OpenSync is a synchronization framework that is platform and distribution
 independent. It consists of several plugins that can be used to connect to
@@ -41,25 +45,29 @@
 
 %prep
 %setup -q
-cd cmake 
+pushd cmake 
 %patch0 -p3
+popd
 
 %build
 mkdir build
-cd build
-%cmake -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
-    -DCMAKE_SKIP_RPATH=YES \
-    -DSWIG_DIR=/usr/share/swig/1.3.36/ ../
-make VERBOSE=1 %{?_smp_mflags}
+pushd build
+%cmake \
+  -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
+  -DSWIG_DIR=/usr/share/swig/%{swig_version} \
+  ..
+popd
+
+make %{?_smp_mflags} -C build
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd build
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C build
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync-1.0
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync-1.0/formats
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync-1.0/{python-,}plugins
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/opensync-1.0
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/opensync-1.0/formats
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/opensync-1.0/{python-,}plugins
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
@@ -94,6 +102,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Mar 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.36-8
+- dynamically set SWIG_DIR
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild