rpms/jpilot-backup/devel jpilot-backup-libdir.patch, 1.2, 1.3 jpilot-backup.spec, 1.2, 1.3

[Patrick Charles François Ernzer]

Author: pcfe

Update of /cvs/pkgs/rpms/jpilot-backup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19124

Modified Files:
	jpilot-backup-libdir.patch jpilot-backup.spec 
Log Message:
* 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


jpilot-backup-libdir.patch:

Index: jpilot-backup-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/devel/jpilot-backup-libdir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jpilot-backup-libdir.patch	24 Feb 2009 14:45:28 -0000	1.2
+++ jpilot-backup-libdir.patch	25 Feb 2009 07:44:14 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up jpilot-backup-0.60/configure.in.libdir jpilot-backup-0.60/configure.in
---- jpilot-backup-0.60/configure.in.libdir	2009-02-07 21:47:10.000000000 +0200
-+++ jpilot-backup-0.60/configure.in	2009-02-21 17:01:03.000000000 +0200
+--- 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"
  
@@ -11,8 +11,8 @@
     if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then
        pilotlibs=yes
 diff -up jpilot-backup-0.60/configure.libdir jpilot-backup-0.60/configure
---- jpilot-backup-0.60/configure.libdir	2009-02-07 21:49:59.000000000 +0200
-+++ jpilot-backup-0.60/configure	2009-02-21 17:01:03.000000000 +0200
+--- 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"
  
@@ -24,25 +24,25 @@
        pilotlibs=yes
 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-21 17:01:03.000000000 +0200
++++ 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.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-21 17:02:52.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@


Index: jpilot-backup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpilot-backup/devel/jpilot-backup.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jpilot-backup.spec	24 Feb 2009 14:45:28 -0000	1.2
+++ jpilot-backup.spec	25 Feb 2009 07:44:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Enhanced backup plugin for J-Pilot
 Name: jpilot-backup
 Version: 0.60
-Release: 1%{dist}
+Release: 2%{dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.jlogday.com/code/jpilot-backup/%{name}-%{version}.tar.gz
@@ -22,7 +22,12 @@
 %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 +47,9 @@
 %{_libdir}/jpilot/plugins/libbackup.so
 
 %changelog
+* 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