Merge remote branch 'origin/2.2' into 2.2

This commit is contained in:
Danny Rawlins 2007-02-27 21:18:58 +11:00
commit 9ef7a149da
10 changed files with 679 additions and 537 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
608e3c3e9c9f24609714882e1f32e03b amsn-0.95-makefile.patch
f57e3c2c78a3c7d64c93a78be88846aa amsn-0.95.tar.gz
ee68601d8b7687b2b6fc8e9a4eb67c2f amsn-0.96.diff
3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2

View File

@ -6,25 +6,28 @@
# Depends on: tk
name=amsn
version=0.95
release=5
source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz \
$name-$version-makefile.patch)
version=0.96
release=1
source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2
$name-$version.diff)
build() {
cd $name-$version
patch -p1 < $SRC/$name-$version.diff
./configure \
--prefix=/usr \
--disable-nls
--disable-nls \
--with-tls
patch -p0 -i $SRC/$name-$version-makefile.patch
make && make DESTDIR=$PKG install
rm -fr \
$PKG/usr/share/amsn/{icons, lang/LANG-HOWTO} \
$PKG/usr/share/amsn/utils/BWidget-1.7.0/{CHANGES.txt, ChangeLog, LICENSE.txt, Makefile.in, README.txt} \
$PKG/usr/share/amsn/{skins/default/winicons, utils/snit0.97/license.txt}
rm -rf \
$PKG/usr/share/icons \
$PKG/usr/share/amsn/{icons,docs,lang} \
$PKG/usr/share/amsn/{AGREEMENT,CREDITS,FAQ,GNUGPL} \
$PKG/usr/share/amsn/{HELP,INSTALL,README,TODO}
chown -R root:root $PKG
}

47
amsn/amsn-0.96.diff Normal file
View File

@ -0,0 +1,47 @@
diff -Nru amsn-0.96.orig/Makefile.in amsn-0.96/Makefile.in
--- amsn-0.96.orig/Makefile.in 2007-02-27 19:06:37.000000000 +1000
+++ amsn-0.96/Makefile.in 2007-02-27 19:35:56.000000000 +1000
@@ -142,27 +142,27 @@
install:: $(FILES_TO_INSTALL)
- rm -Rf $(dstdir)/$(PACKAGE)
- mkdir --parents $(dstdir)/$(PACKAGE)
- mkdir -p $(slnkdir)
+ rm -Rf $(DESTDIR)/$(dstdir)/$(PACKAGE)
+ mkdir --parents $(DESTDIR)/$(dstdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)/$(slnkdir)
@for p in $?; do \
- cp -Rf --parents $(srcdir)/$$p $(dstdir)/$(PACKAGE); \
+ cp -Rf --parents $(srcdir)/$$p $(DESTDIR)/$(dstdir)/$(PACKAGE); \
done
- find $(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
- @for p in $(FILES_TO_EXCLUDE); do \
- rm -Rf $(dstdir)/$(PACKAGE)/$$p; \
+ find $(DESTDIR)/$(dstdir)/$(PACKAGE) -name CVS -print | xargs rm -Rf
+ @for p in $(DESTDIR)/$(FILES_TO_EXCLUDE); do \
+ rm -Rf $(DESTDIR)/$(dstdir)/$(PACKAGE)/$$p; \
done
- ln -sf $(dstdir)/$(PACKAGE)/amsn $(slnkdir)/amsn
- ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(slnkdir)/amsn-remote
- ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(slnkdir)/amsn-remote-CLI
-
- chmod -R +rx $(dstdir)/$(PACKAGE)
- mkdir -p $(dstdir)/icons/hicolor
- cp -R $(srcdir)/icons/* $(dstdir)/icons/hicolor
+ ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)/$(slnkdir)/amsn
+ ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)/$(slnkdir)/amsn-remote
+ ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)/$(slnkdir)/amsn-remote-CLI
+
+ chmod -R +rx $(DESTDIR)/$(dstdir)/$(PACKAGE)
+ mkdir -p $(DESTDIR)/$(dstdir)/icons/hicolor
+ cp -R $(srcdir)/icons/* $(DESTDIR)/$(dstdir)/icons/hicolor
- mkdir -p $(dstdir)/applications
- cp $(srcdir)/amsn.desktop $(dstdir)/applications
+ mkdir -p $(DESTDIR)/$(dstdir)/applications
+ cp $(srcdir)/amsn.desktop $(DESTDIR)/$(dstdir)/applications
rpm-install:: $(FILES_TO_INSTALL)
rm -Rf $(INSTALL_PREFIX)/$(dstdir)/$(PACKAGE)

View File

@ -50,6 +50,7 @@ drwxr-xr-x root/root usr/include/claws-mail/common/
-rw-r--r-- root/root usr/include/claws-mail/common/timing.h
-rw-r--r-- root/root usr/include/claws-mail/common/utils.h
-rw-r--r-- root/root usr/include/claws-mail/common/uuencode.h
-rw-r--r-- root/root usr/include/claws-mail/common/valgrind.h
-rw-r--r-- root/root usr/include/claws-mail/common/version.h
-rw-r--r-- root/root usr/include/claws-mail/common/xml.h
-rw-r--r-- root/root usr/include/claws-mail/common/xmlprops.h
@ -68,7 +69,6 @@ drwxr-xr-x root/root usr/include/claws-mail/common/
-rw-r--r-- root/root usr/include/claws-mail/enriched.h
drwxr-xr-x root/root usr/include/claws-mail/etpan/
-rw-r--r-- root/root usr/include/claws-mail/etpan/etpan-errors.h
-rw-r--r-- root/root usr/include/claws-mail/etpan/etpan-log.h
-rw-r--r-- root/root usr/include/claws-mail/etpan/etpan-thread-manager-types.h
-rw-r--r-- root/root usr/include/claws-mail/etpan/etpan-thread-manager.h
-rw-r--r-- root/root usr/include/claws-mail/etpan/imap-thread.h
@ -210,6 +210,7 @@ drwxr-xr-x root/root usr/include/claws-mail/plugins/pgpmime/
-rw-r--r-- root/root usr/include/claws-mail/toolbar.h
-rw-r--r-- root/root usr/include/claws-mail/undo.h
-rw-r--r-- root/root usr/include/claws-mail/unmime.h
-rw-r--r-- root/root usr/include/claws-mail/uri_opener.h
-rw-r--r-- root/root usr/include/claws-mail/vcard.h
-rw-r--r-- root/root usr/include/claws-mail/wizard.h
drwxr-xr-x root/root usr/lib/

View File

@ -1 +1 @@
079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2
c3f6ed9c639dbe7a8f36ecb0d8f59797 claws-mail-2.8.0.tar.bz2

View File

@ -2,12 +2,12 @@
# URL: http://www.claws-mail.org/index.php
# Maintainer: Mikhail Kolesnik, mike at openbunker dot org
# Packager: Brett Goulder, predatorfreak at dcaf-security dot org
# Depends on: gtk openssl libetpan
# Depends on: gtk
# Nice to have: gpgme aspell clamav
# Nice to have: openssl libetpan gpgme aspell clamav dillo libgnomeprintui openldap
name=claws-mail
version=2.7.2
version=2.8.0
release=1
source=(http://dl.sourceforge.net/sylpheed-claws/$name-$version.tar.bz2)
@ -15,10 +15,8 @@ build() {
cd $name-$version
./configure --prefix=/usr \
--disable-nls \
--disable-gnomeprint \
--disable-manual \
--mandir=/usr/man \
--enable-libetpan
--mandir=/usr/man
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/share/doc

12
pp/.footprint Normal file
View File

@ -0,0 +1,12 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python2.4/
drwxr-xr-x root/root usr/lib/python2.4/site-packages/
-rw-r--r-- root/root usr/lib/python2.4/site-packages/pp.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/pp.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/ppserver.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/ppserver.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/pptransport.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/pptransport.pyc
-rw-r--r-- root/root usr/lib/python2.4/site-packages/ppworker.py
-rw-r--r-- root/root usr/lib/python2.4/site-packages/ppworker.pyc

1
pp/.md5sum Normal file
View File

@ -0,0 +1 @@
948c20eae11f70882d9952ccc3a25b67 pp-1.3.2.tar.bz2

17
pp/Pkgfile Normal file
View File

@ -0,0 +1,17 @@
# Description: Parallel and distributed programming for Python
# URL: http://www.parallelpython.com/
# Maintainer: James Mills, prologic at shortcircuit dot net dot au
# Packager: James Mills, prologic at shortcircuit dot net dot au
#
# Depends on: python
name=pp
version=1.3.2
release=1
source=(http://www.parallelpython.com/downloads/$name/$name-$version.tar.bz2)
build() {
cd $name-$version
python setup.py install --root=$PKG
chown -R root:root $PKG
}