rpms/jpilot-backup/F-10 .cvsignore, 1.2, 1.3 jpilot-backup-libdir.patch, 1.1, 1.2 jpilot-backup.spec, 1.1, 1.2 sources, 1.2, 1.3

Patrick Charles François Ernzer pcfe at fedoraproject.org
Tue May 26 14:58:57 UTC 2009 

Author: pcfe

Update of /cvs/pkgs/rpms/jpilot-backup/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7186

Modified Files:
	.cvsignore jpilot-backup-libdir.patch jpilot-backup.spec 
	sources 
Log Message:
update to 0.60



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Jan 2009 04:28:37 -0000	1.2
+++ .cvsignore	26 May 2009 14:58:27 -0000	1.3
@@ -1 +1 @@
-jpilot-backup-0.53.tar.gz
+jpilot-backup-0.60.tar.gz

jpilot-backup-libdir.patch:

Index: jpilot-backup-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/jpilot-backup-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jpilot-backup-libdir.patch	17 Jan 2009 04:28:37 -0000	1.1
+++ jpilot-backup-libdir.patch	26 May 2009 14:58:27 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up jpilot-backup-0.53/configure.in.libdir jpilot-backup-0.53/configure.in
---- jpilot-backup-0.53/configure.in.libdir	2006-09-27 04:46:40.000000000 +0300
-+++ jpilot-backup-0.53/configure.in	2008-12-04 23:52:47.000000000 +0200
+diff -up jpilot-backup-0.60/configure.in.libdir jpilot-backup-0.60/configure.in
+--- jpilot-backup-0.60/configure.in.libdir	2009-02-25 09:24:53.000000000 +0200
++++ jpilot-backup-0.60/configure.in	2009-02-25 09:25:56.000000000 +0200
 @@ -64,7 +64,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
  PILOT_LIBS="-lpisock"
  
@@ -10,10 +10,10 @@ diff -up jpilot-backup-0.53/configure.in
    /usr/extra/pilot/lib ; do
     if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
        pilotlibs=yes
-diff -up jpilot-backup-0.53/configure.libdir jpilot-backup-0.53/configure
---- jpilot-backup-0.53/configure.libdir	2006-09-27 04:48:10.000000000 +0300
-+++ jpilot-backup-0.53/configure	2008-12-04 23:52:47.000000000 +0200
-@@ -19161,7 +19161,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
+diff -up jpilot-backup-0.60/configure.libdir jpilot-backup-0.60/configure
+--- jpilot-backup-0.60/configure.libdir	2009-02-25 09:24:46.000000000 +0200
++++ jpilot-backup-0.60/configure	2009-02-25 09:26:22.000000000 +0200
+@@ -19764,7 +19764,7 @@ pilotlibs=${FORCE_PILOT_LIBS:-no}
  PILOT_LIBS="-lpisock"
  
  if test $pilotlibs = no ; then
@@ -22,27 +22,27 @@ diff -up jpilot-backup-0.53/configure.li
    /usr/extra/pilot/lib ; do
     if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
        pilotlibs=yes
-diff -up jpilot-backup-0.53/src/Makefile.am.libdir jpilot-backup-0.53/src/Makefile.am
---- jpilot-backup-0.53/src/Makefile.am.libdir	2006-09-15 02:20:52.000000000 +0300
-+++ jpilot-backup-0.53/src/Makefile.am	2008-12-04 23:52:47.000000000 +0200
+diff -up jpilot-backup-0.60/src/Makefile.am.libdir jpilot-backup-0.60/src/Makefile.am
+--- jpilot-backup-0.60/src/Makefile.am.libdir	2007-06-12 05:19:24.000000000 +0300
++++ jpilot-backup-0.60/src/Makefile.am	2009-02-25 09:23:52.000000000 +0200
 @@ -12,7 +12,7 @@ libbackup_la_SOURCES = \
  
  libbackup_la_LDFLAGS = -avoid-version
  libbackup_la_LIBADD = @LIBS@ @PILOT_LIBS@ @GTK_LIBS@
 -libdir = $(prefix)/lib/jpilot/plugins
-+libdir = $(prefix)/.. at libdir@/jpilot/plugins
++libdir = $(prefix)@libdir@
  
  AM_CFLAGS = -Wall @PILOT_FLAGS@ @GTK_CFLAGS@
  
-diff -up jpilot-backup-0.53/src/Makefile.in.libdir jpilot-backup-0.53/src/Makefile.in
---- jpilot-backup-0.53/src/Makefile.in.libdir	2008-12-04 23:53:45.000000000 +0200
-+++ jpilot-backup-0.53/src/Makefile.in	2008-12-04 23:54:28.000000000 +0200
-@@ -168,7 +168,7 @@ host_vendor = @host_vendor@
+diff -up jpilot-backup-0.60/src/Makefile.in.libdir jpilot-backup-0.60/src/Makefile.in
+--- jpilot-backup-0.60/src/Makefile.in.libdir	2009-02-07 21:50:02.000000000 +0200
++++ jpilot-backup-0.60/src/Makefile.in	2009-02-25 09:23:52.000000000 +0200
+@@ -171,7 +171,7 @@ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
 -libdir = $(prefix)/lib/jpilot/plugins
-+libdir = $(prefix)/.. at libdir@/jpilot/plugins
++libdir = $(prefix)@libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
- mandir = @mandir@


Index: jpilot-backup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/jpilot-backup.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jpilot-backup.spec	17 Jan 2009 04:28:37 -0000	1.1
+++ jpilot-backup.spec	26 May 2009 14:58:27 -0000	1.2
@@ -1,18 +1,21 @@
 Summary: Enhanced backup plugin for J-Pilot
 Name: jpilot-backup
-Version: 0.53
-Release: 5%{dist}
+Version: 0.60
+Release: 4%{dist}
 License: GPLv2+
 Group: Applications/Productivity
-Source: http://jasonday.home.att.net/code/backup/jpilot-backup-%{version}.tar.gz
+Source: http://www.jlogday.com/code/jpilot-backup/%{name}-%{version}.tar.gz
 Patch0: jpilot-backup-libdir.patch
-URL: http://jasonday.home.att.net/code/backup/backup.html
+URL: http://www.jlogday.com/code/jpilot-backup/
 Requires: jpilot >= 0.99.2
 BuildRequires: pilot-link-devel
 BuildRequires: gtk2-devel
 BuildRequires: gdbm-devel
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+# pilot-link excludes s390 and s390s, as such I must also exclude those arches
+ExcludeArch: s390 s390x
+
 %description
 Features include multiple archives, automatic backups at user-specified times,
 and the ability to specify which databases to backup.
@@ -22,7 +25,12 @@ and the ability to specify which databas
 %patch0 -p1 -b .libdir
 
 %build
-%configure
+%ifarch x86_64 ppc64 s390x
+%configure --libdir=/lib64/jpilot/plugins
+%else
+%configure --libdir=/lib/jpilot/plugins
+%endif
+
 make %{?_smp_mflags}
 
 %install
@@ -42,6 +50,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/jpilot/plugins/libbackup.so
 
 %changelog
+* Tue May 26 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.60-4
+- added a comment as to why I exclude s390 and s390s
+
+* Tue May 26 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.60-3
+- pilot-link excludes s390 and s390s, so this package needs to do the same
+
+* Wed Feb 25 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.60-2
+- fixed patch with help of Phil K. Thanks
+
+* Sat Feb 21 2009 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.60-1
+- bump to 0.60
+- new site for jpilot-backup
+
 * Tue Dec 16 2008 Patrick C. F. Ernzer <jpilot-backup.spec at pcfe.net> 0.53-5
 - incorporate feedback from Bug 474768 Comments #5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Jan 2009 04:28:37 -0000	1.2
+++ sources	26 May 2009 14:58:27 -0000	1.3
@@ -1 +1 @@
-c8a3eefd3706d9614cb25f2bebf48ece  jpilot-backup-0.53.tar.gz
+cb70f1405d08263226e61286fe9e3de5  jpilot-backup-0.60.tar.gz

More information about the scm-commits mailing list