[Frugalware-git] frugalware-current: xdelta-3.0w-1-i686

2009-12-18 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b47b66add08d4845285eecbb66d349b6bca19e4

commit 2b47b66add08d4845285eecbb66d349b6bca19e4
Author: Miklos Vajna 
Date:   Tue Dec 15 11:26:32 2009 +0100

xdelta-3.0w-1-i686

- avoid hardwired python version

diff --git a/source/devel-extra/xdelta/FrugalBuild 
b/source/devel-extra/xdelta/FrugalBuild
index 8b960c8..8f2a5b8 100644
--- a/source/devel-extra/xdelta/FrugalBuild
+++ b/source/devel-extra/xdelta/FrugalBuild
@@ -11,7 +11,7 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
depends=('glibc' 'python')
_F_googlecode_sep="None"
-Finclude googlecode
+Finclude googlecode python
up2date="Flastarchive 
http://code.google.com/p/$pkgname/downloads/list?q=label:Featured .tar.gz"
source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz \
xdelta3-makefile.patch)
@@ -27,7 +27,7 @@ build()
# python module:
python ./setup.py install --root $Fdestdir || Fdie
make xdelta3module.so || Fdie
-   Fexerel /usr/lib/python2.6/site-packages/xdelta3.py
+   Fexerel /$_F_python_libdir/xdelta3.py
}

# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: xdelta-3.0w-1-i686

2009-12-18 Thread exceed 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccf74ac9dda34e0728ef053ec98dd0621eec652f

commit ccf74ac9dda34e0728ef053ec98dd0621eec652f
Author: exceed 
Date:   Mon Dec 14 23:49:03 2009 +0100

xdelta-3.0w-1-i686

* Version bump
* Added patch for makefile
* Added python module
* Fixed up2date

diff --git a/source/devel-extra/xdelta/FrugalBuild 
b/source/devel-extra/xdelta/FrugalBuild
index fcee760..8b960c8 100644
--- a/source/devel-extra/xdelta/FrugalBuild
+++ b/source/devel-extra/xdelta/FrugalBuild
@@ -3,22 +3,31 @@
# Contributor: Othmane Benkirane 

pkgname=xdelta
-pkgver=3.0v.2 #up2date/official version name
-pkgbadver=3.0v2 #archive version name
-pkgverybadver=3.0v #src version name
+pkgver=3.0w
pkgrel=1
pkgdesc="Delta/differential compression tools and binary diff tool"
url="http://xdelta.org";
groups=('devel-extra')
archs=('i686' 'x86_64')
-depends=('glibc')
+depends=('glibc' 'python')
_F_googlecode_sep="None"
Finclude googlecode
-source="http://${pkgname}.googlecode.com/files/${pkgname}${pkgbadver}.tar.gz";
-_F_cd_path="${pkgname}${pkgverybadver}"
-sha1sums=('6422cfe1809fae6fcb39b72e871d948255ce95be')
+up2date="Flastarchive 
http://code.google.com/p/$pkgname/downloads/list?q=label:Featured .tar.gz"
+source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz \
+   xdelta3-makefile.patch)
+_F_cd_path="${pkgname}${pkgver}"
+sha1sums=('2d661f78dab7eefe69136ca9f98d12c5b6a11809' \
+  '14f7c5bbe31f8c3f73e45728ab38ab6e06de7429')
+
build()
{
-   Fmake
+   Fpatchall
+   make xdelta3 || Fdie
Fexerel /usr/bin/xdelta3
+   # python module:
+   python ./setup.py install --root $Fdestdir || Fdie
+   make xdelta3module.so || Fdie
+   Fexerel /usr/lib/python2.6/site-packages/xdelta3.py
}
+
+# optimization OK
diff --git a/source/devel-extra/xdelta/xdelta3-makefile.patch 
b/source/devel-extra/xdelta/xdelta3-makefile.patch
new file mode 100644
index 000..f7fc6a6
--- /dev/null
+++ b/source/devel-extra/xdelta/xdelta3-makefile.patch
@@ -0,0 +1,33 @@
+diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
+--- xdelta3.0v-old/Makefile2009-03-12 01:44:51.0 +
 xdelta3.0v/Makefile2009-03-14 17:02:33.0 +
+@@ -4,7 +4,7 @@
+ UNAME = $(shell uname)
+ CYGWIN = $(findstring CYGWIN, $(UNAME))
+ DARWIN = $(findstring Darwin, $(UNAME))
+-PYVER = 2.5
++PYVER = 2.6
+
+ ifeq ("$(CYGWIN)", "")
+ SWIGTGT = xdelta3module.so
+@@ -200,6 +200,9 @@
+ xdelta3.o: $(SOURCES)
+   $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
+
++xdelta3_PIC.o: $(SOURCES)
++  $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
++
+ xdelta3_wrap.o: xdelta3_wrap.c
+   $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
+ -DHAVE_CONFIG_H \
+@@ -218,8 +221,8 @@
+   cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
+
+ ifeq ("$(DARWIN)", "")
+-xdelta3module.so: xdelta3_wrap.o xdelta3.o
+-  ld -shared xdelta3.o xdelta3_wrap.o \
++xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
++  cc -shared xdelta3_PIC.o xdelta3_wrap.o \
+   -o xdelta3module.so \
+   /usr/lib/libpython$(PYVER).so \
+   -lc
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: xdelta-3.0w-1-i686

2009-12-15 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2b47b66add08d4845285eecbb66d349b6bca19e4

commit 2b47b66add08d4845285eecbb66d349b6bca19e4
Author: Miklos Vajna 
Date:   Tue Dec 15 11:26:32 2009 +0100

xdelta-3.0w-1-i686

- avoid hardwired python version

diff --git a/source/devel-extra/xdelta/FrugalBuild 
b/source/devel-extra/xdelta/FrugalBuild
index 8b960c8..8f2a5b8 100644
--- a/source/devel-extra/xdelta/FrugalBuild
+++ b/source/devel-extra/xdelta/FrugalBuild
@@ -11,7 +11,7 @@ groups=('devel-extra')
archs=('i686' 'x86_64')
depends=('glibc' 'python')
_F_googlecode_sep="None"
-Finclude googlecode
+Finclude googlecode python
up2date="Flastarchive 
http://code.google.com/p/$pkgname/downloads/list?q=label:Featured .tar.gz"
source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz \
xdelta3-makefile.patch)
@@ -27,7 +27,7 @@ build()
# python module:
python ./setup.py install --root $Fdestdir || Fdie
make xdelta3module.so || Fdie
-   Fexerel /usr/lib/python2.6/site-packages/xdelta3.py
+   Fexerel /$_F_python_libdir/xdelta3.py
}

# optimization OK
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: xdelta-3.0w-1-i686

2009-12-14 Thread exceed 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ccf74ac9dda34e0728ef053ec98dd0621eec652f

commit ccf74ac9dda34e0728ef053ec98dd0621eec652f
Author: exceed 
Date:   Mon Dec 14 23:49:03 2009 +0100

xdelta-3.0w-1-i686

* Version bump
* Added patch for makefile
* Added python module
* Fixed up2date

diff --git a/source/devel-extra/xdelta/FrugalBuild 
b/source/devel-extra/xdelta/FrugalBuild
index fcee760..8b960c8 100644
--- a/source/devel-extra/xdelta/FrugalBuild
+++ b/source/devel-extra/xdelta/FrugalBuild
@@ -3,22 +3,31 @@
# Contributor: Othmane Benkirane 

pkgname=xdelta
-pkgver=3.0v.2 #up2date/official version name
-pkgbadver=3.0v2 #archive version name
-pkgverybadver=3.0v #src version name
+pkgver=3.0w
pkgrel=1
pkgdesc="Delta/differential compression tools and binary diff tool"
url="http://xdelta.org";
groups=('devel-extra')
archs=('i686' 'x86_64')
-depends=('glibc')
+depends=('glibc' 'python')
_F_googlecode_sep="None"
Finclude googlecode
-source="http://${pkgname}.googlecode.com/files/${pkgname}${pkgbadver}.tar.gz";
-_F_cd_path="${pkgname}${pkgverybadver}"
-sha1sums=('6422cfe1809fae6fcb39b72e871d948255ce95be')
+up2date="Flastarchive 
http://code.google.com/p/$pkgname/downloads/list?q=label:Featured .tar.gz"
+source=(http://${pkgname}.googlecode.com/files/${pkgname}${pkgver}.tar.gz \
+   xdelta3-makefile.patch)
+_F_cd_path="${pkgname}${pkgver}"
+sha1sums=('2d661f78dab7eefe69136ca9f98d12c5b6a11809' \
+  '14f7c5bbe31f8c3f73e45728ab38ab6e06de7429')
+
build()
{
-   Fmake
+   Fpatchall
+   make xdelta3 || Fdie
Fexerel /usr/bin/xdelta3
+   # python module:
+   python ./setup.py install --root $Fdestdir || Fdie
+   make xdelta3module.so || Fdie
+   Fexerel /usr/lib/python2.6/site-packages/xdelta3.py
}
+
+# optimization OK
diff --git a/source/devel-extra/xdelta/xdelta3-makefile.patch 
b/source/devel-extra/xdelta/xdelta3-makefile.patch
new file mode 100644
index 000..f7fc6a6
--- /dev/null
+++ b/source/devel-extra/xdelta/xdelta3-makefile.patch
@@ -0,0 +1,33 @@
+diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile
+--- xdelta3.0v-old/Makefile2009-03-12 01:44:51.0 +
 xdelta3.0v/Makefile2009-03-14 17:02:33.0 +
+@@ -4,7 +4,7 @@
+ UNAME = $(shell uname)
+ CYGWIN = $(findstring CYGWIN, $(UNAME))
+ DARWIN = $(findstring Darwin, $(UNAME))
+-PYVER = 2.5
++PYVER = 2.6
+
+ ifeq ("$(CYGWIN)", "")
+ SWIGTGT = xdelta3module.so
+@@ -200,6 +200,9 @@
+ xdelta3.o: $(SOURCES)
+   $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
+
++xdelta3_PIC.o: $(SOURCES)
++  $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o
++
+ xdelta3_wrap.o: xdelta3_wrap.c
+   $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
+ -DHAVE_CONFIG_H \
+@@ -218,8 +221,8 @@
+   cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
+
+ ifeq ("$(DARWIN)", "")
+-xdelta3module.so: xdelta3_wrap.o xdelta3.o
+-  ld -shared xdelta3.o xdelta3_wrap.o \
++xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o
++  cc -shared xdelta3_PIC.o xdelta3_wrap.o \
+   -o xdelta3module.so \
+   /usr/lib/libpython$(PYVER).so \
+   -lc
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git