rpms/libopensync/devel .cvsignore, 1.7, 1.8 libopensync.spec, 1.29, 1.30 sources, 1.7, 1.8 libopensync-python26.patch, 1.1, NONE

Wed Mar 25 13:47:59 UTC 2009

Author: awjb

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

Modified Files:
	.cvsignore libopensync.spec sources 
Removed Files:
	libopensync-python26.patch 
Log Message:
- downgrade to 0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8

--- .cvsignore	28 Jan 2008 08:15:58 -0000	1.7
+++ .cvsignore	25 Mar 2009 13:47:28 -0000	1.8
@@ -1 +1 @@
-libopensync-0.36.tar.bz2
+libopensync-0.22.tar.bz2


Index: libopensync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/libopensync.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libopensync.spec	6 Mar 2009 18:40:39 -0000	1.29
+++ libopensync.spec	25 Mar 2009 13:47:28 -0000	1.30
@@ -1,14 +1,14 @@
 %{!?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:        8%{?dist}
+Epoch:          1
+Version:        0.22
+Release:        3%{?dist}
 Summary:        A synchronization framework
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.opensync.org/
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-python26.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -17,11 +17,13 @@
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  pkgconfig
-BuildRequires:  cmake
+BuildRequires:  doxygen
 
-# 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)
+# provide clean downgrade path
+Provides: libopensync-plugin-kdepim = 0:0.36-2
+Obsoletes: libopensync-plugin-kdepim <= 0:0.36-2
+Provides: libopensync-plugin-vformat = 0:0.36-2
+Obsoletes: libopensync-plugin-vformat <= 0:0.36-2
 
 %description
 OpenSync is a synchronization framework that is platform and distribution
@@ -33,7 +35,7 @@
 %package devel
 Summary:        Development package for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       pkgconfig
 Requires:       glib2-devel
 Requires:       libxml2-devel
@@ -45,31 +47,28 @@
 
 %prep
 %setup -q
-pushd cmake 
-%patch0 -p3
-popd
 
-%build
-mkdir build
-pushd build
-%cmake \
-  -DOPENSYNC_LIBEXEC_DIR=%{_libexecdir} \
-  -DSWIG_DIR=/usr/share/swig/%{swig_version} \
-  ..
-popd
+find . -type f -name *.c -exec chmod 644 {} \;
+find . -type f -name *.h -exec chmod 644 {} \;
 
-make %{?_smp_mflags} -C build
+%build
+%configure --disable-static
+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}
 
+doxygen Doxyfile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C build
+make install DESTDIR=$RPM_BUILD_ROOT
 
-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
+find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} \;
+find $RPM_BUILD_ROOT -type f -name *.a -exec rm -f {} \;
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/opensync
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/formats
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/opensync/{python-,}plugins
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,41 +79,45 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README NEWS TODO
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libexecdir}/osplugin
-%dir %{_libdir}/opensync-1.0
-%dir %{_libdir}/opensync-1.0/formats
-%dir %{_libdir}/opensync-1.0/python-plugins
-%dir %{_libdir}/opensync-1.0/plugins
-%{_libdir}/opensync-1.0/formats/*
-%dir %{_datadir}/opensync-1.0
-%{_datadir}/opensync-1.0/*
+%dir %{_libdir}/opensync
+%dir %{_libdir}/opensync/formats
+%dir %{_libdir}/opensync/python-plugins
+%dir %{_libdir}/opensync/plugins
+%{_libdir}/opensync/formats/*
+%dir %{_datadir}/opensync
 %{python_sitearch}/*
 
 %files devel
-%doc CODING
 %defattr(-,root,root,-)
+%doc docs/*
 %dir %{_includedir}/opensync-1.0
 %{_includedir}/opensync-1.0/*
 %{_libdir}/*.so
 %{_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
-
-* Sat Jan 10 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.36-6
-- Add patch from upstream changeset for Python 2.6
-  (http://www.opensync.org/changeset/4383)
+* Tue Feb 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-3
+- fix rpath on x86_64
+- cleanup
+
+* Tue Feb 10 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-2
+- reference versions with epoch
+
+* Fri Feb 06 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-1
+- downgrade to 0.22 (#474070)
+- build devel docs
 
 * Fri Jan 09 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - 0.36-5
 - fix swig version
 
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.36-4
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Jan 2008 08:15:58 -0000	1.7
+++ sources	25 Mar 2009 13:47:28 -0000	1.8
@@ -1 +1 @@
-d8cc7835663566e3626e959d8fb531bf  libopensync-0.36.tar.bz2
+f563ce2543312937a9afb4f8445ef932  libopensync-0.22.tar.bz2


--- libopensync-python26.patch DELETED ---


