rpms/multisync/devel .cvsignore, 1.5, 1.6 multisync.spec, 1.11, 1.12 sources, 1.5, 1.6 multisync-configure.patch, 1.1, NONE multisync-rpath.patch, 1.4, NONE
Andreas Bierfert
awjb at fedoraproject.org
Fri Mar 27 18:50:28 UTC 2009
- Previous message: rpms/msynctool/devel msynctool-rpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 msynctool.spec, 1.5, 1.6 sources, 1.3, 1.4
- Next message: rpms/synce-gnomevfs/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synce-gnomevfs.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/multisync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22365
Modified Files:
.cvsignore multisync.spec sources
Removed Files:
multisync-configure.patch multisync-rpath.patch
Log Message:
- rebuild because of libopensync downgrade
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/multisync/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 25 Apr 2007 16:27:16 -0000 1.5
+++ .cvsignore 27 Mar 2009 18:49:59 -0000 1.6
@@ -1,2 +1 @@
-multisync-gui-0.91.0.tar.gz
-msynctool-0.22.tar.bz2
+multisync-gui-svn384.tar.bz2
Index: multisync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/multisync/devel/multisync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- multisync.spec 21 May 2008 20:36:59 -0000 1.11
+++ multisync.spec 27 Mar 2009 18:49:59 -0000 1.12
@@ -1,27 +1,23 @@
Name: multisync
-Version: 0.91.0
-Release: 5%{?dist}
+Version: 0.91.1
+Release: 0.1.svn384%{?dist}
Summary: Calendar (and other PIM data) synchronization program
Group: Applications/Communications
License: GPLv2+
URL: http://www.opensync.org
-# see http://www.opensync.org/wiki/download
-Source0: %{name}-gui-%{version}.tar.gz
+# obtained via svn with
+# svn co -r 384 http://svn.opensync.org/multisync/branches/multisync-gui-0.2X/ \
+# multisync-gui
+Source0: %{name}-gui-svn384.tar.bz2
Source1: %{name}.desktop
-Source2: msynctool-0.22.tar.bz2
-Patch0: multisync-rpath.patch
-Patch1: multisync-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libopensync-devel >= 0.22
+BuildRequires: libopensync-devel
BuildRequires: libgnomeui-devel
BuildRequires: desktop-file-utils
-BuildRequires: libopensync-plugin-evolution2-devel
-BuildRequires: libopensync-plugin-gpe-devel
-BuildRequires: libopensync-plugin-palm-devel
-BuildRequires: automake
-BuildRequires: libtool
+
+Provides: multisync-gui = %{version}-%{release}
%description
MultiSync is a program to synchronize calendars, addressbooks and other PIM
@@ -31,71 +27,38 @@
For proper use, please install the desired plugins found in the
libopensync-plugin-* packages.
-%package gui
-Summary: GUI interface for multisync
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description gui
-Graphical User Interface for multisync
-
%prep
-%setup -q -n multisync-gui-%{version}
-tar xjvf %{SOURCE2}
-%patch0
-%patch1
+%setup -q -n multisync-gui
echo "env.Append(CCFLAGS = '$RPM_OPT_FLAGS')" >> SConstruct
%build
# both don't like smp flags so disable them for now
-./configure --prefix=%{_prefix} -v
+./configure --prefix=%{_prefix} -v --disable-rpath
%{__make}
-# build gui
-cd msynctool-0.22
-%configure --disable-static --disable-rpath
-%{__make}
%install
rm -fr $RPM_BUILD_ROOT
%{__make} install DESTDIR=$RPM_BUILD_ROOT
-cd msynctool-0.22
-%makeinstall
-
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-#mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.91,}
-
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- %{SOURCE1}
-
-sed -e's/multisync.png/\/usr\/share\/pixmaps\/multisync\/multisync.png/' -i \
-$RPM_BUILD_ROOT%{_datadir}/%{name}/multisync.glade
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/multisync-gui.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root,-)
-%doc msynctool-0.22/{AUTHORS,ChangeLog,COPYING,NEWS,README,TODO}
-%{_bindir}/convcard
-%{_bindir}/msynctool
-%{_bindir}/convtest
-%{_mandir}/man1/convcard*
-%{_mandir}/man1/msynctool*
-
-%files gui
-%defattr(-, root, root,-)
%doc COPYING
-%{_bindir}/multisync
-%{_datadir}/multisync/
-%{_datadir}/pixmaps/multisync/
+%{_bindir}/multisync-gui
+%{_datadir}/multisync-gui/
+%{_datadir}/pixmaps/multisync-gui/
%{_datadir}/applications/*desktop
%changelog
+* Sat Feb 07 2009 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.91.1-0.1.svn384
+- fix #430406
+
* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.91.0-5
- fix license tag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/multisync/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 25 Apr 2007 16:27:16 -0000 1.5
+++ sources 27 Mar 2009 18:49:59 -0000 1.6
@@ -1,2 +1 @@
-3760eef2216f3905f21491b6b345d07f multisync-gui-0.91.0.tar.gz
-3ddc55209e682a8b99a47cf3d0053dbf msynctool-0.22.tar.bz2
+2bc65cf6c98d5fd597fb9fa7c492fd14 multisync-gui-svn384.tar.bz2
--- multisync-configure.patch DELETED ---
--- multisync-rpath.patch DELETED ---
- Previous message: rpms/msynctool/devel msynctool-rpath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 msynctool.spec, 1.5, 1.6 sources, 1.3, 1.4
- Next message: rpms/synce-gnomevfs/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 synce-gnomevfs.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list