DISTFILES: lilo: lilo-23.1.tar.gz lilo-non-english-man-pages.tar.bz2
Files fetched: 1 STORED: http://lilo.alioth.debian.org/ftp/upstream/sources/lilo-23.1.tar.gz 36139c1b8f4dc835fc7775e59ee4b20c lilo-23.1.tar.gz Size: 574423 bytes ALREADY GOT: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/lilo-non-english-man-pages.tar.bz2 5d93c6c01175d2e701ca77de16368a62 lilo-non-english-man-pages.tar.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: lilo/lilo.spec, lilo/lilo-degraded_arrary.patch (REMOVED) - up to...
Author: arekmDate: Fri Dec 3 08:46:26 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 23.1
Files affected:
packages/lilo:
lilo.spec (1.158 - 1.159) , lilo-degraded_arrary.patch (1.2 - NONE)
(REMOVED)
Diffs:
Index: packages/lilo/lilo.spec
diff -u packages/lilo/lilo.spec:1.158 packages/lilo/lilo.spec:1.159
--- packages/lilo/lilo.spec:1.158 Wed Oct 13 14:56:40 2010
+++ packages/lilo/lilo.spec Fri Dec 3 09:46:21 2010
@@ -12,13 +12,13 @@
Summary(uk.UTF-8): Завантажувач для Linux та інших операційних систем
Summary(zh_CN.UTF-8): Linux 和其它系统的引导模块。
Name: lilo
-Version: 23.0
+Version: 23.1
Release: 1
Epoch: 2
License: BSD
Group: Applications/System
-Source0:
https://alioth.debian.org/frs/download.php/3315/%{name}-%{version}.tar.gz
-# Source0-md5: 72f9b547393c0d0fb48b4b1c23f85f50
+Source0:
http://lilo.alioth.debian.org/ftp/upstream/sources/%{name}-%{version}.tar.gz
+# Source0-md5: 36139c1b8f4dc835fc7775e59ee4b20c
Source1: %{name}-pldblack.bmp
Source2: %{name}.conf
Source3: %{name}_functions.sh
@@ -30,7 +30,6 @@
Patch1:%{name}-cc.patch
Patch2:%{name}-pagesize.patch
Patch3:%{name}-dm.patch
-Patch4:%{name}-degraded_arrary.patch
URL: http://lilo.alioth.debian.org/
BuildRequires: bin86 = 0.15
BuildRequires: device-mapper-devel = 1.01.01
@@ -109,14 +108,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
: checkit
sed -i -e 's#/bin/bcc#/nonexistant/file#g' Makefile*
%{__make} all \
CC=%{__cc} \
- OPT=%{rpmcflags} -DLCF_DEVMAPPER \
+ OPT=%{rpmcflags} %{rpmcppflags} -DLCF_DEVMAPPER \
LDFLAGS=%{rpmldflags}
%install
@@ -150,7 +148,6 @@
%doc CHANGELOG* NEWS README TODO QuickInst readme
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{name}.conf
%attr(600,root,root) %config(noreplace,missingok) %verify(not md5 mtime size)
%{_sysconfdir}/disktab
-/boot/diag1.img
/boot/lilo-pldblack.bmp
/boot/lilo-pldblue.bmp
/boot/lilo-pldblue8.bmp
@@ -179,6 +176,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.159 2010/12/03 08:46:21 arekm
+- up to 23.1
+
Revision 1.158 2010/10/13 12:56:40 arekm
- better home page
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilo/lilo.spec?r1=1.158r2=1.159f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: open-iscsi/open-iscsi.init, open-iscsi/open-iscsi.spec, open-iscs...
Author: arekmDate: Fri Dec 3 09:16:09 2010 GMT
Module: packages Tag: HEAD
Log message:
- rel 3; split iscsi.init into iscsi and iscsi-devices; S: multipath-tools
Files affected:
packages/open-iscsi:
open-iscsi.init (1.10 - 1.11) , open-iscsi.spec (1.23 - 1.24) ,
open-iscsi-devices.init (NONE - 1.1) (NEW)
Diffs:
Index: packages/open-iscsi/open-iscsi.init
diff -u packages/open-iscsi/open-iscsi.init:1.10
packages/open-iscsi/open-iscsi.init:1.11
--- packages/open-iscsi/open-iscsi.init:1.10Wed Dec 1 08:54:35 2010
+++ packages/open-iscsi/open-iscsi.init Fri Dec 3 10:16:03 2010
@@ -5,7 +5,6 @@
# chkconfig: 2345 7 89
# description: Start iSCSI to allow access to remote SCSI devices
#
-
# Source function library.
. /etc/rc.d/init.d/functions
@@ -27,17 +26,53 @@
exit 0
fi
+# FIXME this has a false positive for root on nfs
+root_is_iscsi() {
+ rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ $2 == /) { print $4; }}'
/etc/mtab)
+ echo $rootopts | grep -q _netdev return 0 || return 1
+}
+
+force_start() {
+ msg_starting iSCSI Initiator
+ modprobe -s iscsi_tcp
+ modprobe -s ib_iser
+ modprobe -s cxgb3i
+ modprobe -s bnx2i
+ modprobe -s be2iscsi
+ daemon /sbin/iscsid -u iscsi -g iscsi
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ touch /var/lock/subsys/iscsid
+ fi
+ return $RETVAL
+}
+
+use_discoveryd() {
+grep -qrs discovery.sendtargets.use_discoveryd = Yes
/etc/iscsi/send_targets
+if [ $? -eq 0 ] ; then
+return 0
+fi
+
+grep -qrs discovery.isns.use_discoveryd = Yes /etc/iscsi/isns
+if [ $? -eq 0 ] ; then
+return 0
+fi
+
+return 1
+}
+
start() {
# Start daemons.
if [ ! -f /var/lock/subsys/iscsid ]; then
- msg_starting iSCSI Initiator
- modprobe -s scsi_transport_iscsi
- modprobe -s iscsi_tcp
- daemon /sbin/iscsid -u iscsi -g iscsi
- RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- touch /var/lock/subsys/iscsid
- run_cmd Logging into iSCSI targets iscsiadm -m node
-L automatic
+
+ # only start if nodes are setup to startup automatically, root
is iscsi,
+ # or if iscsid is managing the sessions.
+ grep -qrs node.startup = automatic /etc/iscsi/nodes
+ if [ $? -eq 0 ] || root_is_iscsi || use_discoveryd ; then
+ force_start
+ RETVAL=$?
+ else
+ RETVAL=0
fi
else
msg_already_running iSCSI Initiator
@@ -47,9 +82,30 @@
stop() {
# Stop daemons.
if [ -f /var/lock/subsys/iscsid ]; then
- run_cmd Logging out from iSCSI targets iscsiadm -m node -U all
+ if use_discoveryd ; then
+ iscsiadm -k 0 2/dev/null
+ fi
+
msg_stopping iSCSI Initiator
- killproc iscsid
+ if [ -n $(iscsiadm -m session 2/dev/null | egrep
tcp|iser|bnx2i|cxgb3i|be2iscsi) ]; then
+ deltext; fail
+ nls Not stopping iSCSI Initiator: iscsi sessions still
active
+ return 0
+ fi
+
+ iscsiadm -k 0 2/dev/null
+
+ # only remove the iscsi drivers when offload is used
+ rmmod bnx2i 2/dev/null
+ rmmod cnic 2/dev/null
+
+ rmmod cxgb3i 2/dev/null
+
+ modprobe -r be2iscsi 2/dev/null
+
+ modprobe -r ib_iser 2/dev/null
+ modprobe -r iscsi_tcp 2/dev/null
+
rm -f /var/lock/subsys/iscsid /dev/null 21
else
msg_not_running iSCSI Initiator
Index: packages/open-iscsi/open-iscsi.spec
diff -u packages/open-iscsi/open-iscsi.spec:1.23
packages/open-iscsi/open-iscsi.spec:1.24
--- packages/open-iscsi/open-iscsi.spec:1.23Sat Nov 27 19:51:00 2010
+++ packages/open-iscsi/open-iscsi.spec Fri Dec 3 10:16:03 2010
@@ -3,7 +3,7 @@
# - /sbin/iscsistart is linked static, should it be linked uclibc/klibc-static
for initrd?
#
%definesubver 872
-%definerel 2
+%definerel 3
Summary: iSCSI - SCSI over IP
Summary(pl.UTF-8): iSCSI - SCSI po IP
Name: open-iscsi
@@ -15,6 +15,7 @@
# Source0-md5: b4df94f08c241352bb964043b3e44779
Source1: %{name}.init
Source2: %{name}.sysconfig
+Source3: %{name}-devices.init
Patch0:%{name}-build.patch
URL: http://www.open-iscsi.org/
BuildRequires: db-devel
@@ -24,6 +25,7 @@
BuildRequires: rpmbuild(macros) =
packages: open-iscsi/open-iscsi.spec ... and package iscsi-devices
Author: arekmDate: Fri Dec 3 09:17:01 2010 GMT
Module: packages Tag: HEAD
Log message:
... and package iscsi-devices
Files affected:
packages/open-iscsi:
open-iscsi.spec (1.24 - 1.25)
Diffs:
Index: packages/open-iscsi/open-iscsi.spec
diff -u packages/open-iscsi/open-iscsi.spec:1.24
packages/open-iscsi/open-iscsi.spec:1.25
--- packages/open-iscsi/open-iscsi.spec:1.24Fri Dec 3 10:16:03 2010
+++ packages/open-iscsi/open-iscsi.spec Fri Dec 3 10:16:55 2010
@@ -121,6 +121,7 @@
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/iscsi/initiatorname.iscsi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/iscsi
%attr(754,root,root) /etc/rc.d/init.d/iscsi
+%attr(754,root,root) /etc/rc.d/init.d/iscsi-devices
%attr(755,root,root) %{_sbindir}/iscsi-iname
%attr(755,root,root) %{_sbindir}/iscsiadm
%attr(755,root,root) %{_sbindir}/iscsid
@@ -134,6 +135,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.25 2010/12/03 09:16:55 arekm
+... and package iscsi-devices
+
Revision 1.24 2010/12/03 09:16:03 arekm
- rel 3; split iscsi.init into iscsi and iscsi-devices; S: multipath-tools
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi.spec?r1=1.24r2=1.25f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: open-iscsi/open-iscsi.init - show ok at success
Author: arekmDate: Fri Dec 3 09:19:25 2010 GMT Module: packages Tag: HEAD Log message: - show ok at success Files affected: packages/open-iscsi: open-iscsi.init (1.11 - 1.12) Diffs: Index: packages/open-iscsi/open-iscsi.init diff -u packages/open-iscsi/open-iscsi.init:1.11 packages/open-iscsi/open-iscsi.init:1.12 --- packages/open-iscsi/open-iscsi.init:1.11Fri Dec 3 10:16:03 2010 +++ packages/open-iscsi/open-iscsi.init Fri Dec 3 10:19:20 2010 @@ -86,7 +86,7 @@ iscsiadm -k 0 2/dev/null fi - msg_stopping iSCSI Initiator + msg_stopping iSCSI Initiator; busy if [ -n $(iscsiadm -m session 2/dev/null | egrep tcp|iser|bnx2i|cxgb3i|be2iscsi) ]; then deltext; fail nls Not stopping iSCSI Initiator: iscsi sessions still active @@ -105,6 +105,8 @@ modprobe -r ib_iser 2/dev/null modprobe -r iscsi_tcp 2/dev/null + + deltext; ok rm -f /var/lock/subsys/iscsid /dev/null 21 else CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi.init?r1=1.11r2=1.12f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: open-iscsi/open-iscsi-devices.init - display sessions for status; ...
Author: arekmDate: Fri Dec 3 09:21:51 2010 GMT Module: packages Tag: HEAD Log message: - display sessions for status; something better is welcome Files affected: packages/open-iscsi: open-iscsi-devices.init (1.1 - 1.2) Diffs: Index: packages/open-iscsi/open-iscsi-devices.init diff -u packages/open-iscsi/open-iscsi-devices.init:1.1 packages/open-iscsi/open-iscsi-devices.init:1.2 --- packages/open-iscsi/open-iscsi-devices.init:1.1 Fri Dec 3 10:16:03 2010 +++ packages/open-iscsi/open-iscsi-devices.init Fri Dec 3 10:21:45 2010 @@ -99,7 +99,7 @@ condrestart 7 ;; status) - # FIXME + iscsiadm -m session exit $? ;; *) CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi-devices.init?r1=1.1r2=1.2f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 10:38:23 2010
New Revision: 11927
Added:
rc-scripts/trunk/rc.d/init.d/netfs (contents, props changed)
Log:
Networked filesystems mount/umount. Unfinished.
Added: rc-scripts/trunk/rc.d/init.d/netfs
==
--- (empty file)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 10:38:23 2010
@@ -0,0 +1,159 @@
+#!/bin/sh
+#
+# netfs Mount network filesystems.
+#
+# Authors: Bill Nottingham nott...@redhat.com
+# AJ Lewis ale...@redhat.com
+# Miquel van Smoorenburg, miqu...@drinkel.nl.mugnet.org
+#
+# chkconfig: 345 25 75
+# description: Mounts and unmounts all Network File System (NFS), \
+# CIFS (Lan Manager/Windows), and NCP (NetWare) mount points.
+
+[ -f /etc/sysconfig/network ] || exit 0
+. /etc/init.d/functions
+. /etc/sysconfig/network
+
+NFSFSTAB=$(LC_ALL=C awk '!/^#/ $3 ~ /^nfs/ $3 != nfsd $4 !~
/noauto/ { print $2 }' /etc/fstab)
+CIFSFSTAB=$(LC_ALL=C awk '!/^#/ $3 == cifs $4 !~ /noauto/ { print $2
}' /etc/fstab)
+NCPFSTAB=$(LC_ALL=C awk '!/^#/ $3 == ncpfs $4 !~ /noauto/ { print $2
}' /etc/fstab)
+NETDEVFSTAB=$(LC_ALL=C awk '!/^#/ $4 ~/_netdev/ $4 !~ /noauto/ { print
$1 }' /etc/fstab)
+
+NFSMTAB=$(LC_ALL=C awk '$3 ~ /^nfs/ $3 != nfsd $2 != / { print $2 }'
/proc/mounts)
+CIFSMTAB=$(LC_ALL=C awk '$3 == cifs { print $2 }' /proc/mounts)
+NCPMTAB=$(LC_ALL=C awk '$3 == ncpfs { print $2 }' /proc/mounts)
+NETDEVMTAB=$(LC_ALL=C awk '$4 ~ /_netdev/ $2 != / { print $2 }' /etc/mtab)
+
+# See how we were called.
+case $1 in
+ start)
+[ ! -f /var/lock/subsys/network ] exit 0
+[ $EUID != 0 ] exit 4
+[ -n $NFSFSTAB ]
+ {
+ [ ! -f /var/lock/subsys/rpcbind ] service rpcbind start
+ run_cmd Mounting NFS filesystems: mount -a -t nfs,nfs4
+ }
+[ -n $CIFSFSTAB ] run_cmd Mounting CIFS filesystems: mount -a
-t cifs
+[ -n $NCPFSTAB ] run_cmd Mounting NCP filesystems: mount -a -t
ncpfs
+[ -n $NETDEVFSTAB ]
+ {
+ if [ -f /etc/mdadm.conf ]; then
+ mdadm -A -s
+ fi
+ if [ -f /etc/multipath.conf ] [ -x /sbin/multipath ]; then
+ modprobe dm-multipath /dev/null 21
+ /sbin/multipath -v 0
+ if [ -x /sbin/kpartx ]; then
+ /sbin/dmsetup ls --target multipath --exec /sbin/kpartx
-a -p p
+ fi
+ fi
+ if [ -x /sbin/lvm ]; then
+ if /sbin/lvm vgscan /dev/null 21 ; then
+ run_cmd Setting up Logical Volume Management:
/sbin/lvm vgchange -a y
+ fi
+ fi
+
+ if [ -f /etc/crypttab ]; then
+ init_crypto 1
+ fi
+
+ show Checking network-attached filesystems; started
+ initlog -c fsck -A -T -R -a -t opts=_netdev
+ rc=$?
+
+ if [ $rc -gt 1 ]; then
+ echo
+ echo
+ nls *** An error occurred during the file system check.
+ nls *** Dropping you to a shell; the system will reboot
+ nls *** when you leave the shell.
+
+ PS1=$(nls '(Repair filesystem)# '); export PS1
+ [ $SELINUX = 1 ] disable_selinux
+ if ! is_no $RUN_SULOGIN_ON_ERR; then
+ /sbin/sulogin
+ else
+ /bin/sh
+ fi
+ shutdown -r now
+ fi
+ }
+ touch /var/lock/subsys/netfs
+ run_cmd Mounting other filesystems: mount -a -t
nonfs,nfs4,cifs,ncpfs,gfs
+ ;;
+ stop)
+# Unmount loopback stuff first
+[ $EUID != 0 ] exit 4
+ __umount_loopback_loop
+ if [ -n $NETDEVMTAB ]; then
+ __umount_loop '$4 ~ /_netdev/ $2 != / {print $2}' \
+ /etc/mtab \
+ $(nls Unmounting network block filesystems: ) \
+ $(nls Unmounting network block filesystems (retry): )
+ fi
+ if [ -n $NFSMTAB ]; then
+ __umount_loop '$3 ~ /^nfs/ $3 != nfsd $2 != / {print
$2}' \
+ /proc/mounts \
+ $(nls Unmounting NFS filesystems: ) \
+ $(nls Unmounting NFS filesystems (retry): ) \
+ -f -l
+ fi
+ [ -n $CIFSMTAB ] run_cmd Unmounting CIFS filesystems: umount -a
-t cifs
+ [ -n $NCPMTAB ] run_cmd Unmounting NCP filesystems: umount -a
-t ncp,ncpfs
+ rm -f /var/lock/subsys/netfs
+ ;;
+ status)
+ if [ -f /proc/mounts ] ; then
+ [ -n $NFSFSTAB ] {
+nls Configured NFS mountpoints:
+for fs in $NFSFSTAB; do echo $fs ; done
+ }
+ [ -n $CIFSFSTAB ] {
+nls Configured CIFS mountpoints:
+
packages: open-iscsi/open-iscsi.init - iscsid daemon itself doesn't need ne...
Author: arekmDate: Fri Dec 3 09:43:33 2010 GMT
Module: packages Tag: HEAD
Log message:
- iscsid daemon itself doesn't need network
Files affected:
packages/open-iscsi:
open-iscsi.init (1.12 - 1.13)
Diffs:
Index: packages/open-iscsi/open-iscsi.init
diff -u packages/open-iscsi/open-iscsi.init:1.12
packages/open-iscsi/open-iscsi.init:1.13
--- packages/open-iscsi/open-iscsi.init:1.12Fri Dec 3 10:19:20 2010
+++ packages/open-iscsi/open-iscsi.init Fri Dec 3 10:43:27 2010
@@ -8,22 +8,9 @@
# Source function library.
. /etc/rc.d/init.d/functions
-# Source networking configuration.
-. /etc/sysconfig/network
-
# Source oident configureation.
if [ -f /etc/sysconfig/iscsi ]; then
. /etc/sysconfig/iscsi
-fi
-
-# Check that networking is up.
-if is_yes ${NETWORKING}; then
- if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ];
then
- msg_network_down iSCSI Initiator
- exit 1
- fi
-else
- exit 0
fi
# FIXME this has a false positive for root on nfs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi.init?r1=1.12r2=1.13f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 11:15:43 2010
New Revision: 11928
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
Don't touch nfs if we have separate nfsfs script.
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 11:15:43 2010
@@ -14,7 +14,12 @@
. /etc/init.d/functions
. /etc/sysconfig/network
-NFSFSTAB=$(LC_ALL=C awk '!/^#/ $3 ~ /^nfs/ $3 != nfsd $4 !~
/noauto/ { print $2 }' /etc/fstab)
+# nfs uses own script for that
+if [ ! -f /etc/rc.d/init.d/nfsfs ]; then
+ NFSFSTAB=$(LC_ALL=C awk '!/^#/ $3 ~ /^nfs/ $3 != nfsd $4 !~
/noauto/ { print $2 }' /etc/fstab)
+ NFSMTAB=$(LC_ALL=C awk '$3 ~ /^nfs/ $3 != nfsd $2 != / {
print $2 }' /proc/mounts)
+fi
+
CIFSFSTAB=$(LC_ALL=C awk '!/^#/ $3 == cifs $4 !~ /noauto/ { print $2
}' /etc/fstab)
NCPFSTAB=$(LC_ALL=C awk '!/^#/ $3 == ncpfs $4 !~ /noauto/ { print $2
}' /etc/fstab)
NETDEVFSTAB=$(LC_ALL=C awk '!/^#/ $4 ~/_netdev/ $4 !~ /noauto/ { print
$1 }' /etc/fstab)
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: scribus/scribus.spec - start update to 1.3.9 - drop cmake options...
Author: lisu Date: Fri Dec 3 10:22:11 2010 GMT
Module: packages Tag: HEAD
Log message:
- start update to 1.3.9
- drop cmake options provided by cmake macro, BR: rpmbuild(macros) = 1.577
- use rm macros, drop unneeded rms
- docs and some translations missing (TODO)
Files affected:
packages/scribus:
scribus.spec (1.158 - 1.159)
Diffs:
Index: packages/scribus/scribus.spec
diff -u packages/scribus/scribus.spec:1.158 packages/scribus/scribus.spec:1.159
--- packages/scribus/scribus.spec:1.158 Wed Nov 10 10:27:45 2010
+++ packages/scribus/scribus.spec Fri Dec 3 11:22:06 2010
@@ -1,5 +1,7 @@
# $Revision$, $Date$
#
+# TODO: files (docs and some translations)
+#
# Conditional build:
%bcond_withcairo # build with cairo support
%bcond_without cups# build without CUPS support
@@ -7,12 +9,12 @@
Summary: Scribus - Open Source Desktop Publishing
Summary(pl.UTF-8): Scribus - DTP dla Wolnego Oprogramowania
Name: scribus
-Version: 1.3.8
-Release: 4
-License: GPL v2
+Version: 1.3.9
+Release: 1
+License: GPL v2+
Group: X11/Applications/Publishing
Source0:
http://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.bz2
-# Source0-md5: 660b946ea3ba19e894fb5701832a6b54
+# Source0-md5: a54dbf2e10cd88d683d0d34565d29378
Source1: %{name}.desktop
Patch1:%{name}-standard-font-paths.patch
Patch2:%{name}-docs.patch
@@ -40,7 +42,7 @@
BuildRequires: python-modules
BuildRequires: qt-devel = 6:3.0.5
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) = 1.293
+BuildRequires: rpmbuild(macros) = 1.577
BuildRequires: sed = 4.0
BuildRequires: zlib-devel
Requires: desktop-file-utils
@@ -129,10 +131,6 @@
export KDEDIR=%{_prefix}
%cmake . \
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-%if %{_lib} == lib64
- -DLIB_SUFFIX=64 \
-%endif
%if %{with cairo}
-DWANT_CAIRO=1
%else
@@ -155,12 +153,10 @@
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.lt_LT.qm
$RPM_BUILD_ROOT%{_datadir}/%{name}/translations/%{name}.lt.qm
-rm -f $RPM_BUILD_ROOT%{_libdir}/scribus/*.no.qm
-
-rm -f
$RPM_BUILD_ROOT%{_datadir}/%{name}/doc/{AUTHORS,BUILDING,COPYING,ChangeLog,ChangeLogCVS,ChangeLogSVN,INSTALL,NEWS,PACKAGING,README,README.MacOSX,README.OS2,TODO}
+%{__rm}
$RPM_BUILD_ROOT%{_datadir}/%{name}/doc/{AUTHORS,BUILDING,COPYING,ChangeLog,ChangeLogSVN,NEWS,PACKAGING,README,README.MacOSX,TODO}
# currently not used, -devel subpackage?
-rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -193,23 +189,23 @@
%lang(af) %{_datadir}/%{name}/translations/scribus.af.qm
%lang(ar) %{_datadir}/%{name}/translations/scribus.ar.qm
%lang(bg) %{_datadir}/%{name}/translations/scribus.bg.qm
-%lang(bn) %{_datadir}/%{name}/translations/scribus.bn.qm
+#%%lang(bn) %{_datadir}/%{name}/translations/scribus.bn.qm
%lang(br) %{_datadir}/%{name}/translations/scribus.br.qm
-%lang(ca) %{_datadir}/%{name}/translations/scribus.ca.qm
+#%%lang(ca) %{_datadir}/%{name}/translations/scribus.ca.qm
%lang(cs) %{_datadir}/%{name}/translations/scribus.cs.qm
%lang(cy) %{_datadir}/%{name}/translations/scribus.cy.qm
-%lang(da) %{_datadir}/%{name}/translations/scribus.da.qm
+#%%lang(da) %{_datadir}/%{name}/translations/scribus.da.qm
%lang(de) %{_datadir}/%{name}/translations/scribus.de.qm
%lang(de_CH) %{_datadir}/%{name}/translations/scribus.de_CH.qm
-%lang(de) %{_datadir}/%{name}/translations/scribus.de_ol.qm
-%lang(dz) %{_datadir}/%{name}/translations/scribus.dz.qm
+#%%lang(de) %{_datadir}/%{name}/translations/scribus.de_ol.qm
+#%%lang(dz) %{_datadir}/%{name}/translations/scribus.dz.qm
%lang(el) %{_datadir}/%{name}/translations/scribus.el.qm
%lang(en_AU) %{_datadir}/%{name}/translations/scribus.en_AU.qm
%lang(en_GB) %{_datadir}/%{name}/translations/scribus.en_GB.qm
%lang(en_US) %{_datadir}/%{name}/translations/scribus.en_US.qm
-%lang(eo) %{_datadir}/%{name}/translations/scribus.eo.qm
-%lang(es) %{_datadir}/%{name}/translations/scribus.es.qm
-%lang(es) %{_datadir}/%{name}/translations/scribus.es_LA.qm
+#%%lang(eo) %{_datadir}/%{name}/translations/scribus.eo.qm
+#%%lang(es) %{_datadir}/%{name}/translations/scribus.es.qm
+#%%lang(es) %{_datadir}/%{name}/translations/scribus.es_LA.qm
%lang(et) %{_datadir}/%{name}/translations/scribus.et.qm
%lang(eu) %{_datadir}/%{name}/translations/scribus.eu.qm
%lang(fi) %{_datadir}/%{name}/translations/scribus.fi.qm
@@ -222,13 +218,13 @@
%lang(ko) %{_datadir}/%{name}/translations/scribus.ko.qm
%lang(lt) %{_datadir}/%{name}/translations/scribus.lt.qm
%lang(nl) %{_datadir}/%{name}/translations/scribus.nl.qm
-%lang(nb) %{_datadir}/%{name}/translations/scribus.nb.qm
-%lang(pl) %{_datadir}/%{name}/translations/scribus.pl.qm
+#%%lang(nb)
DISTFILES: scribus: scribus-1.3.9.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/scribus/scribus-1.3.9.tar.bz2 a54dbf2e10cd88d683d0d34565d29378 scribus-1.3.9.tar.bz2 Size: 35729860 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/functions
Author: arekm
Date: Fri Dec 3 11:25:01 2010
New Revision: 11929
Modified:
rc-scripts/trunk/rc.d/init.d/functions
Log:
__umount_*loop from FC.
Modified: rc-scripts/trunk/rc.d/init.d/functions
==
--- rc-scripts/trunk/rc.d/init.d/functions (original)
+++ rc-scripts/trunk/rc.d/init.d/functions Fri Dec 3 11:25:01 2010
@@ -1037,6 +1037,66 @@
fi
}
+# __umount_loop awk_program fstab_file first_msg retry_msg umount_args
+# awk_program should process fstab_file and return a list of fstab-encoded
+# paths; it doesn't have to handle comments in fstab_file.
+__umount_loop() {
+ local remaining sig=
+ local retry=3 count
+
+ remaining=$(LC_ALL=C awk /^#/ {next} $1 $2 | sort -r)
+ while [ -n $remaining -a $retry -gt 0 ]; do
+ if [ $retry -eq 3 ]; then
+ run_cmd $3 fstab-decode umount $5 $remaining
+ else
+ run_cmd $4 fstab-decode umount $5 $remaining
+ fi
+ count=4
+ remaining=$(LC_ALL=C awk /^#/ {next} $1 $2 | sort -r)
+ while [ $count -gt 0 ]; do
+ [ -z $remaining ] break
+ count=$(($count-1))
+ usleep 50
+ remaining=$(LC_ALL=C awk /^#/ {next} $1 $2 | sort
-r)
+ done
+ [ -z $remaining ] break
+ fstab-decode /sbin/fuser -k -m $sig $remaining /dev/null
+ sleep 3
+ retry=$(($retry -1))
+ sig=-9
+ done
+}
+
+# Similar to __umount loop above, specialized for loopback devices
+__umount_loopback_loop() {
+ local remaining devremaining sig=
+ local retry=3
+
+ remaining=$(awk '$1 ~ /^\/dev\/loop/ $2 != / {print $2}'
/proc/mounts)
+ devremaining=$(awk '$1 ~ /^\/dev\/loop/ $2 != / {print $1}'
/proc/mounts)
+ while [ -n $remaining -a $retry -gt 0 ]; do
+ if [ $retry -eq 3 ]; then
+ run_cmd Unmounting loopback filesystems: \
+ fstab-decode umount $remaining
+ else
+ run_cmd Unmounting loopback filesystems (retry): \
+ fstab-decode umount $remaining
+ fi
+ for dev in $devremaining ; do
+ losetup $dev /dev/null 21 \
+ run_cmd Detaching loopback device $dev: \
+ losetup -d $dev
+ done
+ remaining=$(awk '$1 ~ /^\/dev\/loop/ $2 != / {print $2}'
/proc/mounts)
+ devremaining=$(awk '$1 ~ /^\/dev\/loop/ $2 != / {print
$1}' /proc/mounts)
+ [ -z $remaining ] break
+ fstab-decode /sbin/fuser -k -m $sig $remaining /dev/null
+ sleep 3
+ retry=$(($retry -1))
+ sig=-9
+ done
+}
+
rc_cache_init() {
# If we have cachefile, use it.
# If we don't, create memory variables and try to save silently,
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 11:30:53 2010
New Revision: 11930
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
Bugfixes. Seems to be working fine.
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 11:30:53 2010
@@ -89,19 +89,19 @@
;;
stop)
# Unmount loopback stuff first
-[ $EUID != 0 ] exit 4
+ [ $(id -u) != 0 ] exit 4
__umount_loopback_loop
if [ -n $NETDEVMTAB ]; then
__umount_loop '$4 ~ /_netdev/ $2 != / {print $2}' \
/etc/mtab \
- $(nls Unmounting network block filesystems: ) \
- $(nls Unmounting network block filesystems (retry): )
+ $(nls Unmounting network block filesystems: ) \
+ $(nls Unmounting network block filesystems (retry):
)
fi
if [ -n $NFSMTAB ]; then
__umount_loop '$3 ~ /^nfs/ $3 != nfsd $2 != / {print
$2}' \
/proc/mounts \
- $(nls Unmounting NFS filesystems: ) \
- $(nls Unmounting NFS filesystems (retry): ) \
+ $(nls Unmounting NFS filesystems: ) \
+ $(nls Unmounting NFS filesystems (retry): ) \
-f -l
fi
[ -n $CIFSMTAB ] run_cmd Unmounting CIFS filesystems: umount -a
-t cifs
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/TODO
Author: arekm Date: Fri Dec 3 11:31:50 2010 New Revision: 11931 Modified: rc-scripts/trunk/TODO Log: - better umount on stop Modified: rc-scripts/trunk/TODO == --- rc-scripts/trunk/TODO (original) +++ rc-scripts/trunk/TODO Fri Dec 3 11:31:50 2010 @@ -13,6 +13,7 @@ killproc slapd -TERM --waitforname slapd --waitfortime 300 while correct would be: killproc --waitforname slapd --waitfortime 300 slapd -TERM +- switch to use __umount_*loop instead of own umount loop when stopping system Not realy important but maybe nice: - Add checking for privileges during restarting ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 11:33:40 2010
New Revision: 11932
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
: not needed.
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 11:33:40 2010
@@ -37,10 +37,10 @@
[ -n $NFSFSTAB ]
{
[ ! -f /var/lock/subsys/rpcbind ] service rpcbind start
- run_cmd Mounting NFS filesystems: mount -a -t nfs,nfs4
+ run_cmd Mounting NFS filesystems mount -a -t nfs,nfs4
}
-[ -n $CIFSFSTAB ] run_cmd Mounting CIFS filesystems: mount -a
-t cifs
-[ -n $NCPFSTAB ] run_cmd Mounting NCP filesystems: mount -a -t
ncpfs
+[ -n $CIFSFSTAB ] run_cmd Mounting CIFS filesystems mount -a -t
cifs
+[ -n $NCPFSTAB ] run_cmd Mounting NCP filesystems mount -a -t
ncpfs
[ -n $NETDEVFSTAB ]
{
if [ -f /etc/mdadm.conf ]; then
@@ -85,7 +85,7 @@
fi
}
touch /var/lock/subsys/netfs
- run_cmd Mounting other filesystems: mount -a -t
nonfs,nfs4,cifs,ncpfs,gfs
+ run_cmd Mounting other filesystems mount -a -t
nonfs,nfs4,cifs,ncpfs,gfs
;;
stop)
# Unmount loopback stuff first
@@ -94,18 +94,18 @@
if [ -n $NETDEVMTAB ]; then
__umount_loop '$4 ~ /_netdev/ $2 != / {print $2}' \
/etc/mtab \
- $(nls Unmounting network block filesystems: ) \
- $(nls Unmounting network block filesystems (retry):
)
+ $(nls Unmounting network block filesystems) \
+ $(nls Unmounting network block filesystems (retry))
fi
if [ -n $NFSMTAB ]; then
__umount_loop '$3 ~ /^nfs/ $3 != nfsd $2 != / {print
$2}' \
/proc/mounts \
- $(nls Unmounting NFS filesystems: ) \
- $(nls Unmounting NFS filesystems (retry): ) \
+ $(nls Unmounting NFS filesystems) \
+ $(nls Unmounting NFS filesystems (retry)) \
-f -l
fi
- [ -n $CIFSMTAB ] run_cmd Unmounting CIFS filesystems: umount -a
-t cifs
- [ -n $NCPMTAB ] run_cmd Unmounting NCP filesystems: umount -a
-t ncp,ncpfs
+ [ -n $CIFSMTAB ] run_cmd Unmounting CIFS filesystems umount -a
-t cifs
+ [ -n $NCPMTAB ] run_cmd Unmounting NCP filesystems umount -a -t
ncp,ncpfs
rm -f /var/lock/subsys/netfs
;;
status)
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d: Makefile.am network
Author: arekm
Date: Fri Dec 3 11:37:12 2010
New Revision: 11933
Modified:
rc-scripts/trunk/rc.d/init.d/Makefile.am
rc-scripts/trunk/rc.d/init.d/network
Log:
Bring in netfs.
Modified: rc-scripts/trunk/rc.d/init.d/Makefile.am
==
--- rc-scripts/trunk/rc.d/init.d/Makefile.am(original)
+++ rc-scripts/trunk/rc.d/init.d/Makefile.amFri Dec 3 11:37:12 2010
@@ -6,6 +6,7 @@
allowlogin \
cpusets \
killall \
+ netfs \
network \
random \
single \
Modified: rc-scripts/trunk/rc.d/init.d/network
==
--- rc-scripts/trunk/rc.d/init.d/network(original)
+++ rc-scripts/trunk/rc.d/init.d/networkFri Dec 3 11:37:12 2010
@@ -223,17 +223,6 @@
if [ -x /etc/rc.d/init.d/netfs -a -f /var/lock/subsys/netfs ];
then
/etc/rc.d/init.d/netfs stop
- else
- netmtab=$(awk '{ if ($3 ~ /^(smbfs|ncpfs|cifs)$/ )
print $3}' /proc/mounts)
- if (echo $netmtab | grep -q smbfs); then
- run_cmd Unmounting SMB filesystems umount -at
smbfs
- fi
- if (echo $netmtab | grep -q ncpfs); then
- run_cmd Unmounting NCP filesystems umount -at
ncpfs
- fi
- if (echo $netmtab | grep -q cifs); then
- run_cmd Unmounting CIFS filesystems umount
-at cifs
- fi
fi
fi
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (NSIS_2_10): nsis/nsis.spec - 2.10 testing, oldest available relea...
Author: glen Date: Fri Dec 3 10:39:57 2010 GMT
Module: packages Tag: NSIS_2_10
Log message:
- 2.10 testing, oldest available release with scons build
Files affected:
packages/nsis:
nsis.spec (1.3 - 1.3.2.1)
Diffs:
Index: packages/nsis/nsis.spec
diff -u packages/nsis/nsis.spec:1.3 packages/nsis/nsis.spec:1.3.2.1
--- packages/nsis/nsis.spec:1.3 Thu Dec 2 17:33:44 2010
+++ packages/nsis/nsis.spec Fri Dec 3 11:39:52 2010
@@ -1,16 +1,15 @@
# $Revision$, $Date$
Summary: Open Source installer build tool for Windows applications
Name: nsis
-Version: 2.34
-Release: 1
+Version: 2.10
+Release: 0.2
License: zlib/libpng
Group: Development/Tools
URL: http://nsis.sourceforge.net/
-Source0:
http://downloads.sourceforge.net/nsis/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 60243c2562710eeac45bda1378e4c88c
+Source0:
http://downloads.sourceforge.net/nsis/%{name}-%{version}-1-src.tar.bz2
+# Source0-md5: 800cb67e4043b12bc29bd049f8382dca
Source1: http://downloads.sourceforge.net/nsis/%{name}-%{version}.zip
-# Source1-md5: 565d17b3ff12dffcf678ec252a892c04
-Patch0:optflags.patch
+# Source1-md5: a4eca14f4fd429fee18db892e8041484
BuildRequires: libstdc++-devel
%ifarch %{x8664}
BuildRequires: libstdc++32-devel
@@ -28,7 +27,6 @@
%prep
%setup -q -n %{name}-%{version}-src -a1
%{__cp} -aux %{name}-%{version}/* .
-%patch0 -p1
%{__rm} -rf Docs/StrFunc
@@ -37,42 +35,50 @@
# not to mistake.
cat 'EOF' build.sh
#!/bin/sh
-%scons $@ \
+%scons \
APPEND_CCFLAGS=%{rpmcflags} \
APPEND_CXXFLAGS=%{rpmcxxflags} \
APPEND_LINKFLAGS=%{rpmldflags} \
- PREFIX=%{_prefix} \
- PREFIX_DEST=$RPM_BUILD_ROOT \
- PREFIX_CONF=%{_sysconfdir} \
+ PREFIX=%{_datadir}/nsis \
SKIPSTUBS=all \
SKIPPLUGINS=all \
- SKIPUTILS=Library/RegTool,UIs,Makensisw,zip2exe,MakeLangId,NSIS Menu \
+
SKIPUTILS=Library/LibraryLocal,Library/RegTool,UIs,Makensisw,zip2exe,MakeLangId,NSIS
Menu \
SKIPMISC=all \
VERSION=%{version} \
- STRIP=false
+ STRIP=false \
+ $@
EOF
chmod a+rx build.sh
./build.sh
%install
rm -rf $RPM_BUILD_ROOT
-./build.sh install
-
install -d $RPM_BUILD_ROOT%{_datadir}/nsis
-cp -fr Bin Contrib Include Menu Plugins Stubs $RPM_BUILD_ROOT%{_datadir}/nsis
+cp -a NSIS.chm Bin Contrib Include Menu Plugins Stubs
$RPM_BUILD_ROOT%{_datadir}/nsis
+
+sh -x ./build.sh install \
+ PREFIX=$RPM_BUILD_ROOT%{_datadir}/nsis
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}
+#mv $RPM_BUILD_ROOT{%{_datadir}/nsis,%{_bindir}}/makensis
+#mv $RPM_BUILD_ROOT{%{_datadir}/nsis,%{_sysconfdir}}/nsisconf.nsh
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a Examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING Docs Examples
-%config(noreplace) %{_sysconfdir}/nsisconf.nsh
-%attr(755,root,root) %{_bindir}/GenPat
-%attr(755,root,root) %{_bindir}/LibraryLocal
-%attr(755,root,root) %{_bindir}/makensis
+%doc Docs/*
+#%config(noreplace) %{_sysconfdir}/nsisconf.nsh
+#%attr(755,root,root) %{_bindir}/GenPat
+#%attr(755,root,root) %{_bindir}/LibraryLocal
+#%attr(755,root,root) %{_bindir}/makensis
%{_datadir}/nsis
-%exclude %{_datadir}/doc/nsis
+
+%{_examplesdir}/%{name}-%{version}
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
@@ -80,6 +86,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3.2.1 2010/12/03 10:39:52 glen
+- 2.10 testing, oldest available release with scons build
+
Revision 1.3 2010/12/02 16:33:44 glen
- needs 32bit libstdc++ on 64bit
- add exclusive arch for ia archs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis/nsis.spec?r1=1.3r2=1.3.2.1f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nsis: nsis-2.10-1-src.tar.bz2 nsis-2.10.zip
Files fetched: 2 STORED: http://downloads.sourceforge.net/nsis/nsis-2.10-1-src.tar.bz2 800cb67e4043b12bc29bd049f8382dca nsis-2.10-1-src.tar.bz2 Size: 1550163 bytes STORED: http://downloads.sourceforge.net/nsis/nsis-2.10.zip a4eca14f4fd429fee18db892e8041484 nsis-2.10.zip Size: 1897845 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: scribus/scribus.spec - comment out cs not ca translation
Author: lisu Date: Fri Dec 3 10:53:35 2010 GMT
Module: packages Tag: HEAD
Log message:
- comment out cs not ca translation
Files affected:
packages/scribus:
scribus.spec (1.159 - 1.160)
Diffs:
Index: packages/scribus/scribus.spec
diff -u packages/scribus/scribus.spec:1.159 packages/scribus/scribus.spec:1.160
--- packages/scribus/scribus.spec:1.159 Fri Dec 3 11:22:06 2010
+++ packages/scribus/scribus.spec Fri Dec 3 11:53:29 2010
@@ -191,8 +191,8 @@
%lang(bg) %{_datadir}/%{name}/translations/scribus.bg.qm
#%%lang(bn) %{_datadir}/%{name}/translations/scribus.bn.qm
%lang(br) %{_datadir}/%{name}/translations/scribus.br.qm
-#%%lang(ca) %{_datadir}/%{name}/translations/scribus.ca.qm
-%lang(cs) %{_datadir}/%{name}/translations/scribus.cs.qm
+%lang(ca) %{_datadir}/%{name}/translations/scribus.ca.qm
+#%%lang(cs) %{_datadir}/%{name}/translations/scribus.cs.qm
%lang(cy) %{_datadir}/%{name}/translations/scribus.cy.qm
#%%lang(da) %{_datadir}/%{name}/translations/scribus.da.qm
%lang(de) %{_datadir}/%{name}/translations/scribus.de.qm
@@ -312,6 +312,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.160 2010/12/03 10:53:29 lisu
+- comment out cs not ca translation
+
Revision 1.159 2010/12/03 10:22:06 lisu
- start update to 1.3.9
- drop cmake options provided by cmake macro, BR: rpmbuild(macros) = 1.577
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scribus/scribus.spec?r1=1.159r2=1.160f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis/nsis.spec - examples to examplesdir
Author: glen Date: Fri Dec 3 11:08:57 2010 GMT
Module: packages Tag: HEAD
Log message:
- examples to examplesdir
Files affected:
packages/nsis:
nsis.spec (1.3 - 1.4)
Diffs:
Index: packages/nsis/nsis.spec
diff -u packages/nsis/nsis.spec:1.3 packages/nsis/nsis.spec:1.4
--- packages/nsis/nsis.spec:1.3 Thu Dec 2 17:33:44 2010
+++ packages/nsis/nsis.spec Fri Dec 3 12:08:52 2010
@@ -58,21 +58,27 @@
rm -rf $RPM_BUILD_ROOT
./build.sh install
+rm -r $RPM_BUILD_ROOT%{_datadir}/doc/nsis
+
install -d $RPM_BUILD_ROOT%{_datadir}/nsis
cp -fr Bin Contrib Include Menu Plugins Stubs $RPM_BUILD_ROOT%{_datadir}/nsis
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a Examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING Docs Examples
+%doc COPYING Docs
%config(noreplace) %{_sysconfdir}/nsisconf.nsh
%attr(755,root,root) %{_bindir}/GenPat
%attr(755,root,root) %{_bindir}/LibraryLocal
%attr(755,root,root) %{_bindir}/makensis
%{_datadir}/nsis
-%exclude %{_datadir}/doc/nsis
+
+%{_examplesdir}/%{name}-%{version}
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
@@ -80,6 +86,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.4 2010/12/03 11:08:52 glen
+- examples to examplesdir
+
Revision 1.3 2010/12/02 16:33:44 glen
- needs 32bit libstdc++ on 64bit
- add exclusive arch for ia archs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis/nsis.spec?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ufoai/ufoai.spec, ufoai-data/ufoai-data.spec - updated to 2.3.1 -...
Author: lisu Date: Fri Dec 3 11:13:14 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 2.3.1
- fix ufoai build
- pl fix
Files affected:
packages/ufoai:
ufoai.spec (1.11 - 1.12)
packages/ufoai-data:
ufoai-data.spec (1.6 - 1.7)
Diffs:
Index: packages/ufoai/ufoai.spec
diff -u packages/ufoai/ufoai.spec:1.11 packages/ufoai/ufoai.spec:1.12
--- packages/ufoai/ufoai.spec:1.11 Sat Jun 19 11:13:59 2010
+++ packages/ufoai/ufoai.spec Fri Dec 3 12:13:09 2010
@@ -2,12 +2,12 @@
Summary: UFO: Alien Invasion - squad-based tactical strategy game in
the tradition of the old X-COM PC games
Summary(pl.UTF-8): UFO: Alien Invasion - gra strategiczna utrzymana w
tradycji starych gier X-COM z PC
Name: ufoai
-Version: 2.3
+Version: 2.3.1
Release: 1
License: GPL
Group: X11/Applications/Games/Strategy
Source0:
http://downloads.sourceforge.net/ufoai/%{name}-%{version}-source.tar.bz2
-# Source0-md5: 9d180ed896a58fe0e514601cd7637dc1
+# Source0-md5: 87b3e1bf3439dc6e5413936034f47d17
Source1: %{name}.desktop
Patch0:%{name}-link.patch
URL: http://ufoai.sourceforge.net/
@@ -57,7 +57,7 @@
%description -l pl.UTF-8
Jest rok 2084. Kierujesz tajną organizacją, która ma obronić Ziemię
przed brutalnymi wrogami. Buduj swoje bazy, przygotuj swój zespół i
-wpadnij w wir szybkiej turowej walki.
+rzuć się w wir szybkiej turowej walki.
UFO: Alien Invasion to oparta o oddziały gra strategiczna utrzymana
w tradycji starych gier X-COM z PC, ale z pewnymi zmianami. Gra łączy
@@ -78,6 +78,9 @@
%setup -q -n %{name}-%{version}-source
%patch0 -p1
+# needed to build properly
+mkdir base
+
%build
CFLAGS=%{rpmcflags} -I/usr/include/ncurses
%configure \
@@ -146,6 +149,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.12 2010/12/03 11:13:09 lisu
+- updated to 2.3.1
+- fix ufoai build
+- pl fix
+
Revision 1.11 2010/06/19 09:13:59 lisu
- fix linking (-link.patch)
Index: packages/ufoai-data/ufoai-data.spec
diff -u packages/ufoai-data/ufoai-data.spec:1.6
packages/ufoai-data/ufoai-data.spec:1.7
--- packages/ufoai-data/ufoai-data.spec:1.6 Fri Jun 18 01:04:49 2010
+++ packages/ufoai-data/ufoai-data.spec Fri Dec 3 12:13:09 2010
@@ -3,12 +3,12 @@
Summary: UFO: Alien Invasion - squad-based tactical strategy game in
the tradition of the old X-COM PC games
Summary(pl.UTF-8): UFO: Alien Invasion - gra strategiczna utrzymana w
tradycji starych gier X-COM z PC
Name: ufoai-data
-Version: 2.3
+Version: 2.3.1
Release: 1
License: GPL
Group: X11/Applications/Games/Strategy
-Source0: http://downloads.sourceforge.net/ufoai/%{version}/data.tar
-# Source0-md5: 08fa6d5c80231468c4d5e886600c8dcf
+Source0:
http://downloads.sourceforge.net/ufoai/%{version}/ufoai-%{version}-data.tar
+# Source0-md5: 11468144bc00618c38667eec04b12a4a
URL: http://ufoai.sourceforge.net/
Requires: ufoai = %{version}
BuildArch: noarch
@@ -38,7 +38,7 @@
%description -l pl.UTF-8
Jest rok 2084. Kierujesz tajną organizacją, która ma obronić Ziemię
przed brutalnymi wrogami. Buduj swoje bazy, przygotuj swój zespół i
-wpadnij w wir szybkiej turowej walki.
+rzuć się w wir szybkiej turowej walki.
UFO: Alien Invasion to oparta o oddziały gra strategiczna utrzymana
w tradycji starych gier X-COM z PC, ale z pewnymi zmianami. Gra łączy
@@ -76,6 +76,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.7 2010/12/03 11:13:09 lisu
+- updated to 2.3.1
+- fix ufoai build
+- pl fix
+
Revision 1.6 2010/06/17 23:04:49 arvenil
- up to 2.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ufoai/ufoai.spec?r1=1.11r2=1.12f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ufoai-data/ufoai-data.spec?r1=1.6r2=1.7f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ufoai: ufoai-2.3.1-source.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/ufoai/ufoai-2.3.1-source.tar.bz2 87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2 Size: 9847575 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/nsis-openvpn.spec (NEW) - initial, just original sou...
Author: glen Date: Fri Dec 3 11:16:26 2010 GMT
Module: packages Tag: HEAD
Log message:
- initial, just original source for now
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u /dev/null packages/nsis-openvpn/nsis-openvpn.spec:1.1
--- /dev/null Fri Dec 3 12:16:26 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 12:16:21 2010
@@ -0,0 +1,47 @@
+# $Revision$, $Date$
+Summary: NSIS OpenVPN installer builder
+Name: nsis-openvpn
+Version: 2.0.9
+Release: 0.1
+# OpenVPN windows executable is GPL, no ideas about the rest
+License: GPL
+Group: Development/Tools
+URL:
http://openvpn.se/files/howto/openvpn-howto_roll_your_own_installation_package.html
+Source0:
http://www.openvpn.se/files/install_packages_source/openvpn_install_source-2.0.9-gui-1.0.3.zip
+# NoSource0-md5: 64fce7dc20fdd991ffdee2cfce9dfb0b
+NoSource: 0
+Requires: nsis
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define_appdir %{_datadir}/nsis/Contrib/OpenVPN
+
+%description
+This package contains needed NSIS scripts and binaries to build
+OpenVPN installer for Windows.
+
+%prep
+%setup -qc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_appdir}
+cp -a . $RPM_BUILD_ROOT%{_appdir}
+rm $RPM_BUILD_ROOT%{_appdir}/ChangeLog
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc ChangeLog
+%{_appdir}
+
+%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
+%changelog
+* %{date} PLD Team feedb...@pld-linux.org
+All persons listed below can be reached at cvs_login@pld-linux.org
+
+$Log$
+Revision 1.1 2010/12/03 11:16:21 glen
+- initial, just original source for now
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-noorigin.patch ...
Author: baggins Date: Fri Dec 3 11:19:29 2010 GMT
Module: packages Tag: HEAD
Log message:
- 3.2.12
- noorigin patch merged upstream
Files affected:
packages/VirtualBox:
VirtualBox.spec (1.329 - 1.330) , VirtualBox-noorigin.patch (1.1 - NONE)
(REMOVED)
Diffs:
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.329
packages/VirtualBox/VirtualBox.spec:1.330
--- packages/VirtualBox/VirtualBox.spec:1.329 Thu Dec 2 21:12:19 2010
+++ packages/VirtualBox/VirtualBox.spec Fri Dec 3 12:19:23 2010
@@ -28,22 +28,22 @@
%define_enable_debug_packages 0
%endif
-%definerel 12
+%definerel 1
%definepname VirtualBox
Summary: VirtualBox OSE - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox OSE - wirtualizator sprzętu x86
Name: %{pname}%{_alt_kernel}
-Version: 3.2.10
+Version: 3.2.12
Release: %{rel}
License: GPL v2
Group: Applications/Emulators
Source0:
http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-OSE.tar.bz2
-# Source0-md5: 5aad764cd4e886f9d80d7bde42163c7a
+# Source0-md5: 4ba1d6c960691f60d1cbfc19c98294d6
Source1:
http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source1-md5: 370bb3e893acffa584536c8f9e966c79
+# Source1-md5: d7f8685fe5fd84757b33d46e6f0b6bc5
Source2:
http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source2-md5: 4fde0f279854334b84c01972fbed2874
+# Source2-md5: 2f670cc8d4f85ff92257252f8de4d7c1
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxguest.init
Source5: %{pname}-vboxnetflt.init
@@ -57,8 +57,7 @@
Patch2:%{pname}-VBoxSysInfo.patch
Patch3:%{pname}-warning_workaround.patch
Patch4:%{pname}-vnc.patch
-Patch5:%{pname}-noorigin.patch
-Patch6:%{pname}-dri.patch
+Patch5:%{pname}-dri.patch
URL: http://www.virtualbox.org/
BuildRequires: rpmbuild(macros) = 1.535
%if %{with userspace}
@@ -411,8 +410,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p0
-%patch6 -p1
+%patch5 -p1
%{__sed} -i -e 's,$VBOX_DOC_PATH,%{_docdir}/%{name}-%{version},'
src/VBox/Installer/linux/virtualbox.desktop
%{__sed} -i -e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/linux/virtualbox.desktop
@@ -835,6 +833,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.330 2010/12/03 11:19:23 baggins
+- 3.2.12
+- noorigin patch merged upstream
+
Revision 1.329 2010/12/02 20:12:19 arekm
- release 12
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.329r2=1.330f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: VirtualBox: VirtualBox-3.2.12-OSE.tar.bz2 UserManual.pdf VBoxGuestAdditions_3.2.12.iso
Files fetched: 3 STORED: http://download.virtualbox.org/virtualbox/3.2.12/VirtualBox-3.2.12-OSE.tar.bz2 4ba1d6c960691f60d1cbfc19c98294d6 VirtualBox-3.2.12-OSE.tar.bz2 Size: 58239733 bytes STORED: http://download.virtualbox.org/virtualbox/3.2.12/UserManual.pdf d7f8685fe5fd84757b33d46e6f0b6bc5 UserManual.pdf Size: 3998426 bytes STORED: http://download.virtualbox.org/virtualbox/3.2.12/VBoxGuestAdditions_3.2.12.iso 2f670cc8d4f85ff92257252f8de4d7c1 VBoxGuestAdditions_3.2.12.iso Size: 33146880 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/nsis-constants.patch...
Author: glen Date: Fri Dec 3 11:25:33 2010 GMT
Module: packages Tag: HEAD
Log message:
- make work with current nsis
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (1.1 - 1.2) , nsis-constants.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.1
packages/nsis-openvpn/nsis-openvpn.spec:1.2
--- packages/nsis-openvpn/nsis-openvpn.spec:1.1 Fri Dec 3 12:16:21 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 12:25:28 2010
@@ -7,10 +7,13 @@
License: GPL
Group: Development/Tools
URL:
http://openvpn.se/files/howto/openvpn-howto_roll_your_own_installation_package.html
-Source0:
http://www.openvpn.se/files/install_packages_source/openvpn_install_source-2.0.9-gui-1.0.3.zip
+Source0:
http://www.openvpn.se/files/install_packages_source/openvpn_install_source-%{version}-gui-1.0.3.zip
# NoSource0-md5: 64fce7dc20fdd991ffdee2cfce9dfb0b
NoSource: 0
-Requires: nsis
+Patch0:nsis-constants.patch
+BuildRequires: rpmbuild(macros) = 1.553
+BuildRequires: unix2dos
+Requires: nsis = 2.34
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -22,6 +25,11 @@
%prep
%setup -qc
+%undos openvpn-gui.nsi
+%patch0 -p1
+
+%build
+unix2dos openvpn-gui.nsi
%install
rm -rf $RPM_BUILD_ROOT
@@ -43,5 +51,8 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.2 2010/12/03 11:25:28 glen
+- make work with current nsis
+
Revision 1.1 2010/12/03 11:16:21 glen
- initial, just original source for now
Index: packages/nsis-openvpn/nsis-constants.patch
diff -u /dev/null packages/nsis-openvpn/nsis-constants.patch:1.1
--- /dev/null Fri Dec 3 12:25:33 2010
+++ packages/nsis-openvpn/nsis-constants.patch Fri Dec 3 12:25:28 2010
@@ -0,0 +1,13 @@
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi~2010-12-03 13:22:23.0
+0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 13:22:26.279396336 +0200
+@@ -218,8 +218,8 @@
+ ;
+ ;Installer Sections
+
+-!define SF_SELECTED 1
+-!define SF_RO 16
++;!define SF_SELECTED 1
++;!define SF_RO 16
+ !define SF_NOT_RO 0xFFEF
+
+ Section OpenVPN User-Space Components SecOpenVPNUserSpace
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.1r2=1.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 12:31:07 2010
New Revision: 11934
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
Bugfix.
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 12:31:07 2010
@@ -33,7 +33,7 @@
case $1 in
start)
[ ! -f /var/lock/subsys/network ] exit 0
-[ $EUID != 0 ] exit 4
+ [ $(id -u) != 0 ] exit 4
[ -n $NFSFSTAB ]
{
[ ! -f /var/lock/subsys/rpcbind ] service rpcbind start
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: arekm
Date: Fri Dec 3 12:33:29 2010
New Revision: 11935
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
Bugfix (bring in cryptsetup; cleanups).
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 12:33:29 2010
@@ -11,7 +11,8 @@
# CIFS (Lan Manager/Windows), and NCP (NetWare) mount points.
[ -f /etc/sysconfig/network ] || exit 0
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
+. /etc/rc.d/init.d/cryptsetup
. /etc/sysconfig/network
# nfs uses own script for that
@@ -55,7 +56,7 @@
fi
if [ -x /sbin/lvm ]; then
if /sbin/lvm vgscan /dev/null 21 ; then
- run_cmd Setting up Logical Volume Management:
/sbin/lvm vgchange -a y
+ run_cmd Setting up Logical Volume Management /sbin/lvm
vgchange -a y
fi
fi
@@ -157,7 +158,7 @@
exit $?
;;
*)
- echo $Usage: $0 {start|stop|restart|reload|status}
+ msg_usage $0 {start|stop|restart|reload|status}
exit 2
esac
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ufoai-data: ufoai-2.3.1-data.tar
Files fetched: 1 STORED: http://downloads.sourceforge.net/ufoai/2.3.1/ufoai-2.3.1-data.tar 11468144bc00618c38667eec04b12a4a ufoai-2.3.1-data.tar Size: 533196800 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/configure.ac
Author: arekm Date: Fri Dec 3 12:43:03 2010 New Revision: 11936 Modified: rc-scripts/trunk/configure.ac Log: 0.4.3.6 Modified: rc-scripts/trunk/configure.ac == --- rc-scripts/trunk/configure.ac (original) +++ rc-scripts/trunk/configure.ac Fri Dec 3 12:43:03 2010 @@ -1,6 +1,6 @@ dnl $Id$ -AC_INIT([rc-scripts], [0.4.3.5], [pld-rc-scri...@lists.pld-linux.org], [rc-scripts]) +AC_INIT([rc-scripts], [0.4.3.6], [pld-rc-scri...@lists.pld-linux.org], [rc-scripts]) AM_INIT_AUTOMAKE ALL_LINGUAS=pl de ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/ChangeLog
Author: arekm Date: Fri Dec 3 12:43:58 2010 New Revision: 11937 Modified: rc-scripts/trunk/ChangeLog Log: Updated. Modified: rc-scripts/trunk/ChangeLog == --- rc-scripts/trunk/ChangeLog (original) +++ rc-scripts/trunk/ChangeLog Fri Dec 3 12:43:58 2010 @@ -1,3 +1,54 @@ +2010-12-03 11:43 + [r11936] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * configure.ac: 0.4.3.6 + +2010-12-03 11:33 + [r11934-11935] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/netfs: Bugfix (bring in cryptsetup; cleanups). + + * rc.d/init.d/netfs: Bugfix. + +2010-12-03 10:37 + [r11933] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/Makefile.am, rc.d/init.d/network: Bring in netfs. + +2010-12-03 10:33 + [r11930-11932] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/netfs: : not needed. + + * TODO: - better umount on stop + + * rc.d/init.d/netfs: Bugfixes. Seems to be working fine. + +2010-12-03 10:25 + [r11929] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/functions: __umount_*loop from FC. + +2010-12-03 10:15 + [r11928] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/netfs: Don't touch nfs if we have separate nfsfs + script. + +2010-12-03 09:38 + [r11927] Arkadiusz Miśkiewicz arekm/at/pld-linux.org + + * rc.d/init.d/netfs (added): Networked filesystems mount/umount. + Unfinished. + +2010-12-02 15:30 + [r11922] Elan Ruusamäe glen/at/pld-linux.org + + * rc.d/rc.sysinit: - avoid crypto init retries if no crypttab is + setup + +2010-11-25 23:54 + [r11913] Jan Rękorajski baggins/at/pld-linux.org + + * rc.d/rc.sysinit: - don't mount cgroup if it's set up in fstab + http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2010-November/152970.html + BTW, all this kinda sucks and needs revamp :( + +2010-11-07 19:54 + [r11900] Elan Ruusamäe glen/at/pld-linux.org + + * rc.d/rc.sysinit: - init crypt mounts also after lvm has been run + 2010-11-06 10:47 + [r11894] Arkadiusz Miśkiewicz arekm/at/pld-linux.org * configure.ac: Release 0.4.3.5. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dunelegacy: dunelegacy-0.96.1-src.tar.bz2
Files fetched: 1 STORED: http://www.myway.de/richieland/dunelegacy-0.96.1-src.tar.bz2 afe35eb859c8cd769535b3a37f4b803b dunelegacy-0.96.1-src.tar.bz2 Size: 1260468 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: dunelegacy/dunelegacy.spec - 0.96.1
Author: lisu Date: Fri Dec 3 11:44:12 2010 GMT
Module: packages Tag: HEAD
Log message:
- 0.96.1
Files affected:
packages/dunelegacy:
dunelegacy.spec (1.11 - 1.12)
Diffs:
Index: packages/dunelegacy/dunelegacy.spec
diff -u packages/dunelegacy/dunelegacy.spec:1.11
packages/dunelegacy/dunelegacy.spec:1.12
--- packages/dunelegacy/dunelegacy.spec:1.11Thu May 13 22:10:46 2010
+++ packages/dunelegacy/dunelegacy.spec Fri Dec 3 12:44:07 2010
@@ -2,12 +2,12 @@
Summary: Updated clone of Westood Studios' Dune2
Summary(pl.UTF-8): Zaktualizowany klon gry Dune2
Name: dunelegacy
-Version: 0.96
+Version: 0.96.1
Release: 1
License: GPL v2+
Group: X11/Applications/Games/Strategy
Source0: http://www.myway.de/richieland/%{name}-%{version}-src.tar.bz2
-# Source0-md5: fccb7d917118439fc4a401b81f2e052f
+# Source0-md5: afe35eb859c8cd769535b3a37f4b803b
URL: http://dunelegacy.sourceforge.net/
Patch0:%{name}-desktop.patch
BuildRequires: SDL_mixer-devel
@@ -85,6 +85,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.12 2010/12/03 11:44:07 lisu
+- 0.96.1
+
Revision 1.11 2010/05/13 20:10:46 sparky
- dropped unused BR: SDL_gfx-devel, SDL_image-devel, SDL_net-devel,
SDL_ttf-devel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dunelegacy/dunelegacy.spec?r1=1.11r2=1.12f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/tags/0.4.3.6
Author: arekm Date: Fri Dec 3 12:44:59 2010 New Revision: 11938 Added: rc-scripts/tags/0.4.3.6/ (props changed) - copied from rev 11937, rc-scripts/trunk/ Log: Released 0.4.3.6. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: rc-scripts: rc-scripts-0.4.3.6.tar.gz
Files fetched: 1 STORED: no-url-copy://rc-scripts-0.4.3.6.tar.gz ef74f5a0b99b12f8a4c630f2b02f04bb rc-scripts-0.4.3.6.tar.gz Size: 380537 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: rc-scripts/rc-scripts.spec, rc-scripts/rc-scripts-svn.patch (REMO...
Author: arekmDate: Fri Dec 3 11:50:46 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 0.4.3.6
Files affected:
packages/rc-scripts:
rc-scripts.spec (1.337 - 1.338) , rc-scripts-svn.patch (1.4 - NONE)
(REMOVED)
Diffs:
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.337
packages/rc-scripts/rc-scripts.spec:1.338
--- packages/rc-scripts/rc-scripts.spec:1.337 Thu Dec 2 16:43:23 2010
+++ packages/rc-scripts/rc-scripts.spec Fri Dec 3 12:50:41 2010
@@ -9,13 +9,12 @@
Summary(pl.UTF-8): inittab i skrypty startowe z katalogu /etc/rc.d
Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları
Name: rc-scripts
-Version: 0.4.3.5
-Release: 3
+Version: 0.4.3.6
+Release: 1
License: GPL v2
Group: Base
Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5: 599cf1c5a381265b513d33258fd2069d
-Patch0:%{name}-svn.patch
+# Source0-md5: ef74f5a0b99b12f8a4c630f2b02f04bb
URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
BuildRequires: autoconf
BuildRequires: automake
@@ -110,7 +109,6 @@
%prep
%setup -q
-%patch0 -p0
%build
%{__aclocal}
@@ -137,6 +135,7 @@
for i in 2 3 4 5; do
ln -s ../init.d/local $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99local
+ ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S25netfs
ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S10network
ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99allowlogin
ln -s ../init.d/sys-chroots
$RPM_BUILD_ROOT/etc/rc.d/rc$i.d/S99sys-chroots
@@ -161,6 +160,7 @@
done
for i in 0 1 6; do
+ ln -s ../init.d/netfs $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K75netfs
ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K90network
ln -s ../init.d/allowlogin $RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01allowlogin
ln -s ../init.d/sys-chroots
$RPM_BUILD_ROOT/etc/rc.d/rc$i.d/K01sys-chroots
@@ -229,6 +229,7 @@
%attr(754,root,root) /etc/rc.d/init.d/cryptsetup
%attr(754,root,root) /etc/rc.d/init.d/killall
%attr(754,root,root) /etc/rc.d/init.d/local
+%attr(754,root,root) /etc/rc.d/init.d/netfs
%attr(754,root,root) /etc/rc.d/init.d/network
%attr(754,root,root) /etc/rc.d/init.d/random
%attr(754,root,root) /etc/rc.d/init.d/single
@@ -243,6 +244,7 @@
%attr(754,root,root) /etc/rc.d/rc?.d/K??cpusets
%attr(754,root,root) /etc/rc.d/rc?.d/K??killall
%attr(754,root,root) /etc/rc.d/rc?.d/K??local
+%attr(754,root,root) /etc/rc.d/rc?.d/K??netfs
%attr(754,root,root) /etc/rc.d/rc?.d/K??network
%attr(754,root,root) /etc/rc.d/rc?.d/K??random
%attr(754,root,root) /etc/rc.d/rc?.d/K??single
@@ -251,6 +253,7 @@
%attr(754,root,root) /etc/rc.d/rc?.d/S??cpusets
%attr(754,root,root) /etc/rc.d/rc?.d/S??killall
%attr(754,root,root) /etc/rc.d/rc?.d/S??local
+%attr(754,root,root) /etc/rc.d/rc?.d/S??netfs
%attr(754,root,root) /etc/rc.d/rc?.d/S??network
%attr(754,root,root) /etc/rc.d/rc?.d/S??random
%attr(754,root,root) /etc/rc.d/rc?.d/S??single
@@ -363,6 +366,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.338 2010/12/03 11:50:41 arekm
+- up to 0.4.3.6
+
Revision 1.337 2010/12/02 15:43:23 arekm
- rel 3; fix errors about init crypt
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.337r2=1.338f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: wammu: wammu-0.35.tar.bz2
Files fetched: 1 STORED: http://dl.cihar.com/wammu/latest/wammu-0.35.tar.bz2 3d0bdf912c6bf383e657b130f5634179 wammu-0.35.tar.bz2 Size: 572550 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wammu/wammu.spec - update to 0.35 - package more man pages - adapter
Author: lisu Date: Fri Dec 3 11:51:42 2010 GMT
Module: packages Tag: HEAD
Log message:
- update to 0.35
- package more man pages
- adapter
Files affected:
packages/wammu:
wammu.spec (1.29 - 1.30)
Diffs:
Index: packages/wammu/wammu.spec
diff -u packages/wammu/wammu.spec:1.29 packages/wammu/wammu.spec:1.30
--- packages/wammu/wammu.spec:1.29 Wed Sep 8 08:57:25 2010
+++ packages/wammu/wammu.spec Fri Dec 3 12:51:37 2010
@@ -5,12 +5,12 @@
Summary: Wammu - Gammu GUI - Mobile phone manager
Summary(pl.UTF-8): Wammu - interfejs graficzny dla Gammu
Name: wammu
-Version: 0.34
+Version: 0.35
Release: 1
License: GPL v2+
Group: Applications/Communications
Source0: http://dl.cihar.com/wammu/latest/%{name}-%{version}.tar.bz2
-# Source0-md5: d5bdcd82379ef04c53258d8c25c1cf31
+# Source0-md5: 3d0bdf912c6bf383e657b130f5634179
URL: http://wammu.eu/
BuildRequires: gammu-devel = 1:1.11.91
BuildRequires: pkgconfig = 1:0.21-2
@@ -35,15 +35,15 @@
other platforms, where Gammu and wxPython works. The communication is
made by Gammu library. Currently supported features:
-* complete support for contacts, todo, calendar
-* can read/create/save/send/backup SMSes
-* sending files to phone (OBEX and Sony Ericsson phones only)
-* SMS composer for multi part SMSes
-* display message including pictures and ringtones playback
-* support for backup and import in various formats
- (vCard, vCalendar, vTodo, iCalendar, gammu own backup, ...)
-* export messages to mail (IMAP4, maildir and mailbox storages)
-* searching for phone
+- complete support for contacts, todo, calendar
+- can read/create/save/send/backup SMSes
+- sending files to phone (OBEX and Sony Ericsson phones only)
+- SMS composer for multi part SMSes
+- display message including pictures and ringtones playback
+- support for backup and import in various formats (vCard, vCalendar,
+ vTodo, iCalendar, gammu own backup, ...)
+- export messages to mail (IMAP4, maildir and mailbox storages)
+- searching for phone
%description -l pl.UTF-8
Wammu to zarządca telefonów komórkowych działający pod Linuksem,
@@ -87,6 +87,12 @@
%{py_sitescriptdir}/Wammu/*
%{py_sitescriptdir}/*.egg-info
%{_mandir}/man1/%{name}*.*
+%lang(cs) %{_mandir}/cs/man1/%{name}*.*
+%lang(de) %{_mandir}/de/man1/%{name}*.*
+%lang(it) %{_mandir}/it/man1/%{name}*.*
+%lang(nl) %{_mandir}/nl/man1/%{name}*.*
+%lang(ru) %{_mandir}/ru/man1/%{name}*.*
+%lang(sk) %{_mandir}/sk/man1/%{name}*.*
%dir %{_datadir}/Wammu
%{_datadir}/Wammu/*
%{_desktopdir}/%{name}.desktop
@@ -97,6 +103,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.30 2010/12/03 11:51:37 lisu
+- update to 0.35
+- package more man pages
+- adapter
+
Revision 1.29 2010/09/08 06:57:25 lisu
- up to 0.34
- adapter
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wammu/wammu.spec?r1=1.29r2=1.30f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLDWWW: Mirrors
Author: arekm Date: Fri Dec 3 11:51:28 2010 GMT Module: PLDWWW URL: http://www.pld-linux.org/Mirrors?action=diffrev2=37rev1=36 Log message: tpnet mirror, mirrored twice a day (3:00 and 12:00) Page affected: Mirrors Diffs: The comment on the change is: tpnet mirror, mirrored twice a day (3:00 and 12:00) * CI TASK, Gdansk, Poland - ftp://ftp.task.pld-linux.org/ * ICM, Warszawa, Poland - ftp://ftp.icm.edu.pl/pub/linux/distributions/pld-linux/ * Paris, France - ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/pld/ + * TP S.A., Warszawa, Poland - ftp://ftp.tpnet.pl/pub/linux/pld/ * Dublin, Irleand - ftp://ftp.heanet.ie/pub/pld-linux/ === HTTP === ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gammu: gammu-1.28.93.tar.bz2
Files fetched: 1 STORED: http://dl.cihar.com/gammu/releases/gammu-1.28.93.tar.bz2 f91bd3c95f17b7f21229a5003ca94303 gammu-1.28.93.tar.bz2 Size: 2500950 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): gammu/gammu.spec - up to 1.28.93 - drop cmake options pro...
Author: lisu Date: Fri Dec 3 12:00:50 2010 GMT
Module: packages Tag: DEVEL
Log message:
- up to 1.28.93
- drop cmake options provided by cmake macro
Files affected:
packages/gammu:
gammu.spec (1.90.2.2 - 1.90.2.3)
Diffs:
Index: packages/gammu/gammu.spec
diff -u packages/gammu/gammu.spec:1.90.2.2 packages/gammu/gammu.spec:1.90.2.3
--- packages/gammu/gammu.spec:1.90.2.2 Tue Oct 5 11:28:06 2010
+++ packages/gammu/gammu.spec Fri Dec 3 13:00:45 2010
@@ -2,13 +2,13 @@
Summary: Tool suite for mobile phones
Summary(pl.UTF-8): Zestaw narzędzi do telefonów komórkowych
Name: gammu
-Version: 1.28.92
+Version: 1.28.93
Release: 1
Epoch: 1
License: GPL v2+
Group: Applications/Communications
Source0: http://dl.cihar.com/gammu/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 43abbb2fce727c18eb858ff8197c6799
+# Source0-md5: f91bd3c95f17b7f21229a5003ca94303
Source1: %{name}-smsd.init
Source2: %{name}-smsd.sysconfig
Patch0:%{name}-etc_dir.patch
@@ -60,11 +60,11 @@
amounts of received or sent messages and automatically process them.
%description smsd -l pl.UTF-8
-Demon SMS Gammu jest programem, któr okresowo sprawdza czy modem GSM
+Demon SMS Gammu jest programem, który okresowo sprawdza czy modem GSM
odebrał jakieś wiadomości, przechowuje je w zdefiniowanym zasobie a
także wysyła wiadomości skolejkowane w tym zasobie. Jest idealnym
narzędziem do zarządzania dużą ilością otrzymanych lub wysyłanych
-wiadomości i atomatycznego przetwarzania ich.
+wiadomości i automatycznego przetwarzania ich.
%package libs
Summary: Gammu library
@@ -136,7 +136,6 @@
mkdir -p build
cd build
%cmake .. \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
-DBUILD_SHARED_LIBS=OFF \
-DINSTALL_LIB_DIR=%{_lib} \
-DINSTALL_LIBDATA_DIR=%{_libdir} \
@@ -145,7 +144,6 @@
mv libgammu/libGammu.a ..
mv smsd/libgsmsd.a ..
%cmake .. \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
-DBUILD_SHARED_LIBS=ON \
-DINSTALL_LIB_DIR=%{_lib} \
-DINSTALL_LIBDATA_DIR=%{_libdir} \
@@ -266,6 +264,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.90.2.3 2010/12/03 12:00:45 lisu
+- up to 1.28.93
+- drop cmake options provided by cmake macro
+
Revision 1.90.2.2 2010/10/05 09:28:06 lisu
- 1.28.92
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gammu/gammu.spec?r1=1.90.2.2r2=1.90.2.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libHX: libHX-3.8.tar.xz
Files fetched: 1 STORED: http://downloads.sourceforge.net/libhx/3.8/libHX-3.8.tar.xz dd84f563d33b5ca70ee0267ce67620c4 libHX-3.8.tar.xz Size: 781076 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: libHX/libHX.spec - up to 3.8
Author: lisu Date: Fri Dec 3 12:04:17 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 3.8
Files affected:
packages/libHX:
libHX.spec (1.17 - 1.18)
Diffs:
Index: packages/libHX/libHX.spec
diff -u packages/libHX/libHX.spec:1.17 packages/libHX/libHX.spec:1.18
--- packages/libHX/libHX.spec:1.17 Fri Sep 3 10:14:15 2010
+++ packages/libHX/libHX.spec Fri Dec 3 13:04:09 2010
@@ -2,12 +2,12 @@
Summary: J.Engelh's general-purpose library
Summary(pl.UTF-8): Biblioteka ogólnego przeznaczenia J. Engelha
Name: libHX
-Version: 3.6
+Version: 3.8
Release: 1
License: LGPL v2 or LGPL v3
Group: Libraries
Source0:
http://downloads.sourceforge.net/libhx/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 3b0963a210c488a8ca6b92cf219fc986
+# Source0-md5: dd84f563d33b5ca70ee0267ce67620c4
URL: http://libhx.sourceforge.net/
BuildRequires: pkgconfig
BuildRequires: tar = 1:1.22
@@ -112,6 +112,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.18 2010/12/03 12:04:09 lisu
+- up to 3.8
+
Revision 1.17 2010/09/03 08:14:15 zbyniu
- CVE note added
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libHX/libHX.spec?r1=1.17r2=1.18f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: libtool/libtool.spec - R: tar (http://www.mail-archive.com/libtoo...
Author: atlerDate: Fri Dec 3 12:17:42 2010 GMT Module: packages Tag: HEAD Log message: - R: tar (http://www.mail-archive.com/libt...@gnu.org/msg11507.html) - rel 3 Files affected: packages/libtool: libtool.spec (1.198 - 1.199) Diffs: Index: packages/libtool/libtool.spec diff -u packages/libtool/libtool.spec:1.198 packages/libtool/libtool.spec:1.199 --- packages/libtool/libtool.spec:1.198 Fri Oct 15 02:49:38 2010 +++ packages/libtool/libtool.spec Fri Dec 3 13:17:37 2010 @@ -7,7 +7,7 @@ Summary(uk.UTF-8): GNU libtool, набір утиліт для генерації динамічних бібліотек Name: libtool Version: 2.4 -Release: 2 +Release: 3 Epoch: 2 License: GPL v2+ Group: Development/Tools @@ -34,6 +34,7 @@ Requires: grep Requires: mktemp Requires: sed +Requires: tar Obsoletes: libltdl-devel 2:2.2 Conflicts: autoconf 2.58 Conflicts: gettext-devel 0.17 @@ -241,6 +242,10 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.199 2010/12/03 12:17:37 atler +- R: tar (http://www.mail-archive.com/libt...@gnu.org/msg11507.html) +- rel 3 + Revision 1.198 2010/10/15 00:49:38 wrobell - requires automake 1.11.1 to build - rel. 2 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtool/libtool.spec?r1=1.198r2=1.199f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: owfs: owfs-2.8p4.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/owfs/owfs-2.8p4.tar.gz beccd8765184b2abea0a3f28dc466ea3 owfs-2.8p4.tar.gz Size: 1295114 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: owfs/owfs.spec - up to 2.8p4 - owctl partly re-enabled - bump son...
Author: lisu Date: Fri Dec 3 12:25:13 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 2.8p4
- owctl partly re-enabled
- bump sonames version
Files affected:
packages/owfs:
owfs.spec (1.38 - 1.39)
Diffs:
Index: packages/owfs/owfs.spec
diff -u packages/owfs/owfs.spec:1.38 packages/owfs/owfs.spec:1.39
--- packages/owfs/owfs.spec:1.38Mon Nov 8 11:22:14 2010
+++ packages/owfs/owfs.spec Fri Dec 3 13:25:08 2010
@@ -21,13 +21,13 @@
Summary: One-wire file system using FUSE
Summary(pl.UTF-8): System plików 1-Wire wykorzystujący FUSE
Name: owfs
-Version: 2.8p3
+Version: 2.8p4
Release: 0.1
Epoch: 2
License: GPL v2+
Group: Applications/System
Source0: http://downloads.sourceforge.net/owfs/%{name}-%{version}.tar.gz
-# Source0-md5: f5abc9ea16dba52c67d06f2333199a7a
+# Source0-md5: beccd8765184b2abea0a3f28dc466ea3
URL: http://owfs.sourceforge.net/
BuildRequires: autoconf = 2.57
BuildRequires: automake
@@ -193,9 +193,9 @@
%endif
%if %{with owphp}
-rm -f $RPM_BUILD_ROOT%{_libdir}/php/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/php/*.la
mv -f $RPM_BUILD_ROOT%{_libdir}/php/libowphp.so{.*.*.*,}
-rm -f $RPM_BUILD_ROOT%{_libdir}/php/libowphp.so.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/php/libowphp.so.*
install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
cat 'EOF' $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/owfs.ini
@@ -209,7 +209,7 @@
%endif
%if %{with owtcl}
-rm -f $RPM_BUILD_ROOT%{_libdir}/owtcl-1.0/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/owtcl-1.0/*.la
gzip src/man/owtcl.3
%endif
@@ -252,11 +252,11 @@
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libow-2.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libow-2.8.so.3
+%attr(755,root,root) %ghost %{_libdir}/libow-2.8.so.4
%attr(755,root,root) %{_libdir}/libowcapi-2.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libowcapi-2.8.so.3
+%attr(755,root,root) %ghost %{_libdir}/libowcapi-2.8.so.4
%attr(755,root,root) %{_libdir}/libownet-2.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libownet-2.8.so.3
+%attr(755,root,root) %ghost %{_libdir}/libownet-2.8.so.4
%files devel
%defattr(644,root,root,755)
@@ -317,11 +317,11 @@
%if %{with owtcl}
%files -n tcl-owfs
%defattr(644,root,root,755)
-#%%dir %{_libdir}/owtcl-1.0
-#%%attr(755,root,root) %{_libdir}/owtcl-1.0/ow-1.0.so
-#%%attr(755,root,root) %{_libdir}/owtcl-1.0/ow.so
+%dir %{_libdir}/owtcl-1.0
+%attr(755,root,root) %{_libdir}/owtcl-1.0/ow-1.0.so
+%attr(755,root,root) %{_libdir}/owtcl-1.0/ow.so
#%%{_libdir}/owtcl-1.0/*.tc0%{_mandir}/man3/owtcl.3*
-%{_mandir}/man3/owtcl.3*
+#%%{_mandir}/man3/owtcl.3*
#%%{_mandir}/mann/owtcl.n*
%endif
@@ -331,6 +331,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.39 2010/12/03 12:25:08 lisu
+- up to 2.8p4
+- owctl partly re-enabled
+- bump sonames version
+
Revision 1.38 2010/11/08 10:22:14 lisu
- 2.8p3
- bump sonames version
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/owfs/owfs.spec?r1=1.38r2=1.39f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ossp-uuid/ossp-uuid.spec - toggle pgsql bcond (broken Makefile) -...
Author: atlerDate: Fri Dec 3 12:40:52 2010 GMT
Module: packages Tag: HEAD
Log message:
- toggle pgsql bcond (broken Makefile)
- fix bconds descriptions
- rel 8
Files affected:
packages/ossp-uuid:
ossp-uuid.spec (1.19 - 1.20)
Diffs:
Index: packages/ossp-uuid/ossp-uuid.spec
diff -u packages/ossp-uuid/ossp-uuid.spec:1.19
packages/ossp-uuid/ossp-uuid.spec:1.20
--- packages/ossp-uuid/ossp-uuid.spec:1.19 Sun May 16 13:00:38 2010
+++ packages/ossp-uuid/ossp-uuid.spec Fri Dec 3 13:40:47 2010
@@ -3,15 +3,15 @@
# - fix bindings compilation (when library is not installed)
#
# Conditional build:
-%bcond_without php # build PHP binding
-%bcond_without perl# build Perl binding
-%bcond_without pgsql # build postgresql binding
+%bcond_without php # don't build PHP binding
+%bcond_without perl# don't build Perl binding
+%bcond_withpgsql # build postgresql binding
Summary: Universally Unique Identifier library
Summary(pl.UTF-8): Biblioteka unikalnych identyfikatorów UUID
Name: ossp-uuid
Version: 1.6.2
-Release: 7
+Release: 8
License: MIT
Group: Libraries
Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
@@ -294,6 +294,11 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.20 2010/12/03 12:40:47 atler
+- toggle pgsql bcond (broken Makefile)
+- fix bconds descriptions
+- rel 8
+
Revision 1.19 2010/05/16 11:00:38 qboosh
- -c++-devel R: libstdc++-devel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ossp-uuid/ossp-uuid.spec?r1=1.19r2=1.20f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: redmine/redmine.spec - add redmine user to http group (redmine ha...
Author: baggins Date: Fri Dec 3 12:53:36 2010 GMT
Module: packages Tag: HEAD
Log message:
- add redmine user to http group (redmine has to access configs in webapps dir)
Files affected:
packages/redmine:
redmine.spec (1.34 - 1.35)
Diffs:
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.34 packages/redmine/redmine.spec:1.35
--- packages/redmine/redmine.spec:1.34 Thu Dec 2 14:20:14 2010
+++ packages/redmine/redmine.spec Fri Dec 3 13:53:30 2010
@@ -200,6 +200,7 @@
%triggerin -- apache 2.2.0, apache-base
%webapp_register httpd %{_webapp}
+%addusertogroup -q redmine http
%triggerun -- apache 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
@@ -280,6 +281,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.35 2010/12/03 12:53:30 baggins
+- add redmine user to http group (redmine has to access configs in webapps dir)
+
Revision 1.34 2010/12/02 13:20:14 baggins
- 1.0.4, builds but completely untested
- 0.9.6 is on REDMINE_0_9 branch
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.34r2=1.35f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: glen
Date: Fri Dec 3 14:04:03 2010
New Revision: 11939
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
- use functions
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 14:04:03 2010
@@ -30,10 +30,8 @@
NCPMTAB=$(LC_ALL=C awk '$3 == ncpfs { print $2 }' /proc/mounts)
NETDEVMTAB=$(LC_ALL=C awk '$4 ~ /_netdev/ $2 != / { print $2 }' /etc/mtab)
-# See how we were called.
-case $1 in
- start)
-[ ! -f /var/lock/subsys/network ] exit 0
+start() {
+ [ ! -f /var/lock/subsys/network ] exit 0
[ $(id -u) != 0 ] exit 4
[ -n $NFSFSTAB ]
{
@@ -87,8 +85,9 @@
}
touch /var/lock/subsys/netfs
run_cmd Mounting other filesystems mount -a -t
nonfs,nfs4,cifs,ncpfs,gfs
- ;;
- stop)
+}
+
+stop() {
# Unmount loopback stuff first
[ $(id -u) != 0 ] exit 4
__umount_loopback_loop
@@ -108,9 +107,10 @@
[ -n $CIFSMTAB ] run_cmd Unmounting CIFS filesystems umount -a
-t cifs
[ -n $NCPMTAB ] run_cmd Unmounting NCP filesystems umount -a -t
ncp,ncpfs
rm -f /var/lock/subsys/netfs
- ;;
- status)
- if [ -f /proc/mounts ] ; then
+}
+
+status() {
+ if [ -f /proc/mounts ]; then
[ -n $NFSFSTAB ] {
nls Configured NFS mountpoints:
for fs in $NFSFSTAB; do echo $fs ; done
@@ -146,20 +146,32 @@
else
nls /proc filesystem unavailable
fi
+
[ -r /var/lock/subsys/netfs ] || exit 3
+}
+
+RETVAL=0
+# See how we were called.
+case $1 in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status
;;
restart)
- $0 stop
- $0 start
- exit $?
+ stop
+ start
;;
reload)
-$0 start
- exit $?
+ start
;;
*)
msg_usage $0 {start|stop|restart|reload|status}
exit 2
esac
-exit 0
+exit $RETVAL
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/init.d/netfs
Author: glen
Date: Fri Dec 3 14:10:32 2010
New Revision: 11940
Modified:
rc-scripts/trunk/rc.d/init.d/netfs
Log:
- some formatting, respect to use functios (RETVAL variable vs exit calls)
Modified: rc-scripts/trunk/rc.d/init.d/netfs
==
--- rc-scripts/trunk/rc.d/init.d/netfs (original)
+++ rc-scripts/trunk/rc.d/init.d/netfs Fri Dec 3 14:10:32 2010
@@ -31,73 +31,87 @@
NETDEVMTAB=$(LC_ALL=C awk '$4 ~ /_netdev/ $2 != / { print $2 }' /etc/mtab)
start() {
- [ ! -f /var/lock/subsys/network ] exit 0
- [ $(id -u) != 0 ] exit 4
-[ -n $NFSFSTAB ]
- {
- [ ! -f /var/lock/subsys/rpcbind ] service rpcbind start
- run_cmd Mounting NFS filesystems mount -a -t nfs,nfs4
- }
-[ -n $CIFSFSTAB ] run_cmd Mounting CIFS filesystems mount -a -t
cifs
-[ -n $NCPFSTAB ] run_cmd Mounting NCP filesystems mount -a -t
ncpfs
-[ -n $NETDEVFSTAB ]
- {
- if [ -f /etc/mdadm.conf ]; then
- mdadm -A -s
- fi
- if [ -f /etc/multipath.conf ] [ -x /sbin/multipath ]; then
- modprobe dm-multipath /dev/null 21
- /sbin/multipath -v 0
- if [ -x /sbin/kpartx ]; then
- /sbin/dmsetup ls --target multipath --exec /sbin/kpartx
-a -p p
+ if [ ! -f /var/lock/subsys/network ]; then
+ return
+ fi
+ if [ $(id -u) != 0 ]; then
+ RETVAL=4
+ return
+ fi
+
+ [ -n $NFSFSTAB ] {
+ [ ! -f /var/lock/subsys/rpcbind ] service rpcbind start
+ run_cmd Mounting NFS filesystems mount -a -t nfs,nfs4
+ }
+
+ [ -n $CIFSFSTAB ] run_cmd Mounting CIFS filesystems mount -a -t
cifs
+ [ -n $NCPFSTAB ] run_cmd Mounting NCP filesystems mount -a -t
ncpfs
+
+ [ -n $NETDEVFSTAB ] {
+ if [ -f /etc/mdadm.conf ]; then
+ mdadm -A -s
+ fi
+
+ if [ -f /etc/multipath.conf ] [ -x /sbin/multipath ]; then
+ modprobe dm-multipath /dev/null 21
+ /sbin/multipath -v 0
+ if [ -x /sbin/kpartx ]; then
+ /sbin/dmsetup ls --target multipath --exec
/sbin/kpartx -a -p p
+ fi
+ fi
+
+ if [ -x /sbin/lvm ]; then
+ if /sbin/lvm vgscan /dev/null 21 ; then
+ run_cmd Setting up Logical Volume Management
/sbin/lvm vgchange -a y
+ fi
fi
- fi
- if [ -x /sbin/lvm ]; then
- if /sbin/lvm vgscan /dev/null 21 ; then
- run_cmd Setting up Logical Volume Management /sbin/lvm
vgchange -a y
+
+ if [ -f /etc/crypttab ]; then
+ init_crypto 1
fi
- fi
- if [ -f /etc/crypttab ]; then
- init_crypto 1
- fi
-
- show Checking network-attached filesystems; started
- initlog -c fsck -A -T -R -a -t opts=_netdev
- rc=$?
-
- if [ $rc -gt 1 ]; then
- echo
- echo
- nls *** An error occurred during the file system check.
- nls *** Dropping you to a shell; the system will reboot
- nls *** when you leave the shell.
+ show Checking network-attached filesystems; started
+ initlog -c fsck -A -T -R -a -t opts=_netdev
+ rc=$?
- PS1=$(nls '(Repair filesystem)# '); export PS1
- [ $SELINUX = 1 ] disable_selinux
- if ! is_no $RUN_SULOGIN_ON_ERR; then
- /sbin/sulogin
- else
- /bin/sh
+ if [ $rc -gt 1 ]; then
+ echo
+ echo
+ nls *** An error occurred during the file system
check.
+ nls *** Dropping you to a shell; the system will
reboot
+ nls *** when you leave the shell.
+
+ PS1=$(nls '(Repair filesystem)# '); export PS1
+ [ $SELINUX = 1 ] disable_selinux
+ if ! is_no $RUN_SULOGIN_ON_ERR; then
+ /sbin/sulogin
+ else
+ /bin/sh
+ fi
+ shutdown -r now
fi
- shutdown -r now
- fi
- }
- touch /var/lock/subsys/netfs
+ }
+
run_cmd Mounting other filesystems mount -a -t
nonfs,nfs4,cifs,ncpfs,gfs
+
+ touch /var/lock/subsys/netfs
}
stop() {
-# Unmount loopback stuff first
- [ $(id -u) != 0 ] exit 4
packages: astah/astah.spec - up to 6.3
Author: glen Date: Fri Dec 3 13:28:22 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 6.3
Files affected:
packages/astah:
astah.spec (1.25 - 1.26)
Diffs:
Index: packages/astah/astah.spec
diff -u packages/astah/astah.spec:1.25 packages/astah/astah.spec:1.26
--- packages/astah/astah.spec:1.25 Fri Nov 5 13:17:37 2010
+++ packages/astah/astah.spec Fri Dec 3 14:28:16 2010
@@ -12,15 +12,15 @@
Summary: A New Java/UML Object-Oriented Design Tool
Summary(pl.UTF-8): Narzędzie wspomagające projektowanie oprogramowania w
UML
Name: astah
-Version: 6.2.1
-Release: 0.6
+Version: 6.3
+Release: 1
# non-distributable, can be used for free upon restrictions and registration
# http://astah.change-vision.com/en/product/astah-eula.html
License: Astah* EULA
Group: Applications/Engineering
# Source0Download:
https://members.change-vision.com/members/files/astah_community/%{ver}/astah-community-%{ver}.zip
Source0: http://jude-users.com/edujjude/%{name}-%{codename}-%{ver}.zip
-# NoSource0-md5: 7323ea7b751a6bd39f0dd906cdf58ca4
+# NoSource0-md5: 2988d8d91352fe3130c03e4d1fdc12a1
Source1: %{name}.desktop
Source2: %{name}.xml
Source3: %{name}-icon.png
@@ -113,8 +113,8 @@
%files
%defattr(644,root,root,755)
-%doc README-e.txt ReleaseNote-e.html
-%doc %lang(ja) README.txt ReleaseNote.html ProductInformation.txt
+%doc ReleaseNote-e.html
+%doc %lang(ja) ReleaseNote.html ProductInformation.txt
%attr(755,root,root) %{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}-%{codename}.jar
@@ -140,6 +140,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.26 2010/12/03 13:28:16 glen
+- up to 6.3
+
Revision 1.25 2010/11/05 12:17:37 glen
- be consistent with macros -- use them
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/astah/astah.spec?r1=1.25r2=1.26f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: astah/astah.spec - bcond to build universal rpm-s (tested fc10)
Author: glen Date: Fri Dec 3 13:38:51 2010 GMT
Module: packages Tag: HEAD
Log message:
- bcond to build universal rpm-s (tested fc10)
Files affected:
packages/astah:
astah.spec (1.26 - 1.27)
Diffs:
Index: packages/astah/astah.spec
diff -u packages/astah/astah.spec:1.26 packages/astah/astah.spec:1.27
--- packages/astah/astah.spec:1.26 Fri Dec 3 14:28:16 2010
+++ packages/astah/astah.spec Fri Dec 3 14:38:46 2010
@@ -5,10 +5,11 @@
#
# Conditional build:
%bcond_without javadoc # don't build javadoc
+%bcond_without pld # don't include pld deps to build
universal rpm
%definecodenamecommunity
%definever %(echo %{version} | tr . _)
-%include /usr/lib/rpm/macros.java
+%{?with_pld:%include /usr/lib/rpm/macros.java}
Summary: A New Java/UML Object-Oriented Design Tool
Summary(pl.UTF-8): Narzędzie wspomagające projektowanie oprogramowania w
UML
Name: astah
@@ -31,7 +32,7 @@
Requires(post,postun): desktop-file-utils
Requires(post,postun): shared-mime-info
BuildRequires: unzip
-Requires: jre-X11
+%{?with_pld:Requires: jre-X11}
Obsoletes: jude
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -140,6 +141,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.27 2010/12/03 13:38:46 glen
+- bcond to build universal rpm-s (tested fc10)
+
Revision 1.26 2010/12/03 13:28:16 glen
- up to 6.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/astah/astah.spec?r1=1.26r2=1.27f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: redmine/redmine.spec - banner about database update
Author: baggins Date: Fri Dec 3 13:48:16 2010 GMT
Module: packages Tag: HEAD
Log message:
- banner about database update
Files affected:
packages/redmine:
redmine.spec (1.35 - 1.36)
Diffs:
Index: packages/redmine/redmine.spec
diff -u packages/redmine/redmine.spec:1.35 packages/redmine/redmine.spec:1.36
--- packages/redmine/redmine.spec:1.35 Fri Dec 3 13:53:30 2010
+++ packages/redmine/redmine.spec Fri Dec 3 14:48:11 2010
@@ -193,6 +193,13 @@
%pre
%useradd -u 212 -d %{_datadir}/%{name} -s /bin/false -c Redmine User -g
nobody redmine
+%post
+%banner -e %{name} -EOF
+You may need to update redmine database, to do this run:
+cd %{_datadir}/%{name}
+rake db:migrate RAILS_ENV=production
+EOF
+
%postun
if [ $1 = 0 ]; then
%userremove redmine
@@ -281,6 +288,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.36 2010/12/03 13:48:11 baggins
+- banner about database update
+
Revision 1.35 2010/12/03 12:53:30 baggins
- add redmine user to http group (redmine has to access configs in webapps dir)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redmine/redmine.spec?r1=1.35r2=1.36f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: calibre: calibre-0.7.31-nofonts.tar.bz2
Files fetched: 1 STORED: no-url://calibre-0.7.31-nofonts.tar.bz2 7ee5f7ef5fe7e50401f5e3f1970d2d6b calibre-0.7.31-nofonts.tar.bz2 Size: 14037638 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: calibre/calibre.spec - up to 0.7.31 - use rm macro
Author: lisu Date: Fri Dec 3 14:02:35 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 0.7.31
- use rm macro
Files affected:
packages/calibre:
calibre.spec (1.51 - 1.52)
Diffs:
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.51 packages/calibre/calibre.spec:1.52
--- packages/calibre/calibre.spec:1.51 Wed Nov 24 00:45:31 2010
+++ packages/calibre/calibre.spec Fri Dec 3 15:02:27 2010
@@ -11,12 +11,12 @@
Summary: E-book converter and library management
Summary(pl.UTF-8): Konwerter oraz biblioteka dla e-booków
Name: calibre
-Version: 0.7.29
-Release: 3
+Version: 0.7.31
+Release: 1
License: GPL v3+
Group: Applications/Multimedia
Source0: %{name}-%{version}-nofonts.tar.bz2
-# Source0-md5: 788c6435ed624e1538000880b923ef13
+# Source0-md5: 7ee5f7ef5fe7e50401f5e3f1970d2d6b
Source1: generate-tarball.sh
Patch0:%{name}-prefix.patch
Patch1:%{name}-manpages.patch
@@ -130,7 +130,7 @@
mv $file
$RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.$lang.qm
done;
-rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-uninstall
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/%{name}-uninstall
%find_lang %{name} --all-name
@@ -173,6 +173,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.52 2010/12/03 14:02:27 lisu
+- up to 0.7.31
+- use rm macro
+
Revision 1.51 2010/11/23 23:45:31 baggins
- rel 3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre.spec?r1=1.51r2=1.52f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: clamav-database/clamav-database.spec - 53.1235.93.2563-20101203
Author: lisu Date: Fri Dec 3 14:34:51 2010 GMT Module: packages Tag: HEAD Log message: - 53.1235.93.2563-20101203 Files affected: packages/clamav-database: clamav-database.spec (1.43 - 1.44) Diffs: Index: packages/clamav-database/clamav-database.spec diff -u packages/clamav-database/clamav-database.spec:1.43 packages/clamav-database/clamav-database.spec:1.44 --- packages/clamav-database/clamav-database.spec:1.43 Mon Nov 22 11:22:50 2010 +++ packages/clamav-database/clamav-database.spec Fri Dec 3 15:34:46 2010 @@ -1,9 +1,9 @@ # $Revision$, $Date$ %definemain_version53 -%definedaily_version 1229 -%definebytecode_version91 -%definesafebrowsing_version2509 -%definedatabase_version20101122 +%definedaily_version 1235 +%definebytecode_version93 +%definesafebrowsing_version2563 +%definedatabase_version20101203 %definerel 1 Summary: Virus databases for clamav Summary(hu.UTF-8): Vírus adatbázis clamav-hoz @@ -16,11 +16,11 @@ Source0: http://db.local.clamav.net/main.cvd # Source0-md5: 99c21c47952b6740d4ff03021a7c968a Source1: http://db.local.clamav.net/daily.cvd -# Source1-md5: f95e626ae657129e97f9e0bc13b64fea +# Source1-md5: 1407ec420b7e853151b9ef3ba751dd42 Source2: http://db.local.clamav.net/bytecode.cvd -# Source2-md5: d37979ae8870300d6ccf09035419ce86 +# Source2-md5: 00b02a8f05b2bc9bfabc8bbb467ccbaa Source3: http://db.local.clamav.net/safebrowsing.cvd -# Source3-md5: 08f3a86580adb11ed379c87f790d6a62 +# Source3-md5: d5ead5aec7070e76518410d566021f75 URL: http://www.clamav.net/ BuildRequires: file Requires: clamav @@ -82,6 +82,9 @@ All persons listed below can be reached at cvs_login@pld-linux.org $Log$ +Revision 1.44 2010/12/03 14:34:46 lisu +- 53.1235.93.2563-20101203 + Revision 1.43 2010/11/22 10:22:50 lisu - 53.1229.91.2509-20101122 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clamav-database/clamav-database.spec?r1=1.43r2=1.44f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: clamav-database: main.cvd daily.cvd bytecode.cvd safebrowsing.cvd
Files fetched: 3 ALREADY GOT: http://db.local.clamav.net/main.cvd 99c21c47952b6740d4ff03021a7c968a main.cvd STORED: http://db.local.clamav.net/daily.cvd 1407ec420b7e853151b9ef3ba751dd42 daily.cvd Size: 276002 bytes STORED: http://db.local.clamav.net/bytecode.cvd 00b02a8f05b2bc9bfabc8bbb467ccbaa bytecode.cvd Size: 89589 bytes STORED: http://db.local.clamav.net/safebrowsing.cvd d5ead5aec7070e76518410d566021f75 safebrowsing.cvd Size: 21594367 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: freedroidrpg/freedroidrpg.spec - updated to 0.14.1 (DEVEL merge) ...
Author: lisu Date: Fri Dec 3 14:38:05 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 0.14.1 (DEVEL merge)
- package ungluem binary as tool
Files affected:
packages/freedroidrpg:
freedroidrpg.spec (1.24 - 1.25)
Diffs:
Index: packages/freedroidrpg/freedroidrpg.spec
diff -u packages/freedroidrpg/freedroidrpg.spec:1.24
packages/freedroidrpg/freedroidrpg.spec:1.25
--- packages/freedroidrpg/freedroidrpg.spec:1.24Fri Feb 5 14:04:13 2010
+++ packages/freedroidrpg/freedroidrpg.spec Fri Dec 3 15:38:00 2010
@@ -8,12 +8,12 @@
Summary: Single player sci-fi RPG featuring Tux and evil MS bots
Summary(pl.UTF-8): RPG z gatunku s-f dla jednego gracza z Tuksem i złymi
robotami MS
Name: freedroidrpg
-Version: 0.13
-Release: 2
+Version: 0.14.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Games
-Source0:
http://downloads.sourceforge.net/freedroid/%{name}-%{version}.tar.bz2
-# Source0-md5: 9109ffb242021ee2074767a5bfad63d4
+Source0:
http://downloads.sourceforge.net/freedroid/%{name}-%{version}.tar.gz
+# Source0-md5: a71c36c0f0c8ce316852d2826357bc01
Source1: %{name}.desktop
Source2: %{name}.png
URL: http://freedroid.sourceforge.net/
@@ -104,7 +104,6 @@
%{_datadir}/%{name}
%{_desktopdir}/%{name}.desktop
%{_pixmapsdir}/%{name}.png
-#%%{_mandir}/man6/freedroidRPG.6*
%if %{with tools}
%files tools
@@ -112,6 +111,7 @@
%attr(755,root,root) %{_bindir}/croppy
%attr(755,root,root) %{_bindir}/gluem
%attr(755,root,root) %{_bindir}/pngtoico
+%attr(755,root,root) %{_bindir}/ungluem
%endif
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
@@ -120,6 +120,19 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.25 2010/12/03 14:38:00 lisu
+- updated to 0.14.1 (DEVEL merge)
+- package ungluem binary as tool
+
+Revision 1.24.2.3 2010/11/16 09:54:48 lisu
+- up to 0.14rc3
+
+Revision 1.24.2.2 2010/11/11 14:38:05 lisu
+- typo
+
+Revision 1.24.2.1 2010/11/09 10:25:36 lisu
+- up to 0.14rc1
+
Revision 1.24 2010/02/05 13:04:13 lisu
- rel 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freedroidrpg/freedroidrpg.spec?r1=1.24r2=1.25f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: freedroidrpg: freedroidrpg-0.14.1.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/freedroid/freedroidrpg-0.14.1.tar.gz a71c36c0f0c8ce316852d2826357bc01 freedroidrpg-0.14.1.tar.gz Size: 161715770 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: freetype/freetype.spec, freetype/freetype-CVE-2010-3855.patch (RE...
Author: draenog Date: Fri Dec 3 14:44:05 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 2.4.4
- remove CVE-2010-3855.patch (applied upstream)
Files affected:
packages/freetype:
freetype.spec (1.157 - 1.158) , freetype-CVE-2010-3855.patch (1.1 - NONE)
(REMOVED)
Diffs:
Index: packages/freetype/freetype.spec
diff -u packages/freetype/freetype.spec:1.157
packages/freetype/freetype.spec:1.158
--- packages/freetype/freetype.spec:1.157 Wed Nov 24 00:14:23 2010
+++ packages/freetype/freetype.spec Fri Dec 3 15:44:00 2010
@@ -13,18 +13,17 @@
Summary(ru.UTF-8): Растеризатор шрифтов TrueType
Summary(uk.UTF-8): Растеризатор шрифтів TrueType
Name: freetype
-Version: 2.4.3
-Release: 3
+Version: 2.4.4
+Release: 1
Epoch: 1
License: GPL or FTL
Group: Libraries
Source0:
http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 75ac7082bde7b3805dc5d6bc806fa045
+# Source0-md5: b3e2b6e2f1c3e0dffa1fd2a0f848b671
Source1:
http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 79a0fa0444eb7f2f46e75cae74c0772d
+# Source1-md5: a657e301bc1568848ee981297ca599dc
Source2:
http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: ffc0152660b96ba2126926860e6d7bcc
-Patch0:%{name}-CVE-2010-3855.patch
+# Source2-md5: 8a95c095fa5fe87a00b08e3027105071
URL: http://www.freetype.org/
BuildRequires: automake
BuildRequires: python
@@ -189,7 +188,6 @@
%prep
%setup -q -a1 -a2
-%patch0 -p1
%build
CFLAGS=%{rpmcflags} \
@@ -264,6 +262,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.158 2010/12/03 14:44:00 draenog
+- up to 2.4.4
+- remove CVE-2010-3855.patch (applied upstream)
+
Revision 1.157 2010/11/23 23:14:23 draenog
- patch for CVE-2010-3855
- adapterized
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freetype/freetype.spec?r1=1.157r2=1.158f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: freetype: freetype-2.4.4.tar.bz2 freetype-doc-2.4.4.tar.bz2 ft2demos-2.4.4.tar.bz2
Files fetched: 3 STORED: http://downloads.sourceforge.net/freetype/freetype-2.4.4.tar.bz2 b3e2b6e2f1c3e0dffa1fd2a0f848b671 freetype-2.4.4.tar.bz2 Size: 1442053 bytes STORED: http://downloads.sourceforge.net/freetype/freetype-doc-2.4.4.tar.bz2 a657e301bc1568848ee981297ca599dc freetype-doc-2.4.4.tar.bz2 Size: 104304 bytes STORED: http://downloads.sourceforge.net/freetype/ft2demos-2.4.4.tar.bz2 8a95c095fa5fe87a00b08e3027105071 ft2demos-2.4.4.tar.bz2 Size: 161949 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/skip-components.patc...
Author: glen Date: Fri Dec 3 15:00:38 2010 GMT
Module: packages Tag: HEAD
Log message:
- allow skipping some components
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (1.2 - 1.3) , skip-components.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.2
packages/nsis-openvpn/nsis-openvpn.spec:1.3
--- packages/nsis-openvpn/nsis-openvpn.spec:1.2 Fri Dec 3 12:25:28 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 16:00:33 2010
@@ -2,7 +2,7 @@
Summary: NSIS OpenVPN installer builder
Name: nsis-openvpn
Version: 2.0.9
-Release: 0.1
+Release: 0.3
# OpenVPN windows executable is GPL, no ideas about the rest
License: GPL
Group: Development/Tools
@@ -11,6 +11,7 @@
# NoSource0-md5: 64fce7dc20fdd991ffdee2cfce9dfb0b
NoSource: 0
Patch0:nsis-constants.patch
+Patch1:skip-components.patch
BuildRequires: rpmbuild(macros) = 1.553
BuildRequires: unix2dos
Requires: nsis = 2.34
@@ -27,6 +28,7 @@
%setup -qc
%undos openvpn-gui.nsi
%patch0 -p1
+%patch1 -p1
%build
unix2dos openvpn-gui.nsi
@@ -51,6 +53,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2010/12/03 15:00:33 glen
+- allow skipping some components
+
Revision 1.2 2010/12/03 11:25:28 glen
- make work with current nsis
Index: packages/nsis-openvpn/skip-components.patch
diff -u /dev/null packages/nsis-openvpn/skip-components.patch:1.1
--- /dev/null Fri Dec 3 16:00:38 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 16:00:33 2010
@@ -0,0 +1,42 @@
+--- OpenVPN/openvpn-gui.nsi2010-12-03 13:36:41.0 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 16:58:10.857685865 +0200
+@@ -231,6 +231,7 @@
+
+ SectionEnd
+
++!ifndef SKIP_EASYRSA
+ Section OpenVPN RSA Certificate Management Scripts SecOpenVPNEasyRSA
+
+ SetOverwrite on
+@@ -253,6 +254,7 @@
+ File ${HOME}\easy-rsa\serial.start
+
+ SectionEnd
++!endif
+
+ Section OpenVPN GUI SecGUI
+
+@@ -280,6 +282,7 @@
+ Section AutoStart OpenVPN GUI SecGUIAuto
+ SectionEnd
+
++!ifndef SKIP_MYCERT
+ Section My Certificate Wizard SecMYCERT
+
+ SetOverwrite on
+@@ -288,6 +291,7 @@
+ File ${HOME}\mycertwizard\mycert.ini
+
+ SectionEnd
++!endif
+
+ Section Hide the TAP-Win32 Virtual Ethernet Adapter SecTAPHidden
+ SectionEnd
+@@ -324,6 +328,7 @@
+ Section OpenVPN File Associations SecFileAssociation
+ SectionEnd
+
++!ifndef SKIP_OPENSSL
+ Section OpenSSL DLLs SecOpenSSLDLLs
+
+ SetOverwrite on
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - typo
Author: glen Date: Fri Dec 3 15:12:14 2010 GMT
Module: packages Tag: HEAD
Log message:
- typo
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.1 - 1.2)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.1
packages/nsis-openvpn/skip-components.patch:1.2
--- packages/nsis-openvpn/skip-components.patch:1.1 Fri Dec 3 16:00:33 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 16:12:09 2010
@@ -1,5 +1,5 @@
OpenVPN/openvpn-gui.nsi2010-12-03 13:36:41.0 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 16:58:10.857685865 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 16:58:10.857685865 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:10:53.461359172 +0200
@@ -231,6 +231,7 @@
SectionEnd
@@ -40,3 +40,11 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
+@@ -340,6 +345,7 @@
+ File ${BIN}\openssl.exe
+
+ SectionEnd
++!endif
+
+ Section TAP-Win32 Virtual Ethernet Adapter SecTAP
+
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.1r2=1.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - update also welcome text if ...
Author: glen Date: Fri Dec 3 15:22:34 2010 GMT
Module: packages Tag: HEAD
Log message:
- update also welcome text if if components skipped
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.2 - 1.3)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.2
packages/nsis-openvpn/skip-components.patch:1.3
--- packages/nsis-openvpn/skip-components.patch:1.2 Fri Dec 3 16:12:09 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 16:22:29 2010
@@ -1,6 +1,23 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 16:58:10.857685865 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:10:53.461359172 +0200
-@@ -231,6 +231,7 @@
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:10:53.461359172 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:18:50.417769474 +0200
+@@ -106,7 +106,15 @@
+
+ !define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
+
+- !define MUI_WELCOMEPAGE_TEXT This wizard will guide you through the
installation of:\r\n\r\nOpenVPN - an Open Source VPN package by James
Yonan.\r\n\r\nOpenVPN GUI - A Graphical User Interface for OpenVPN by Mathias
Sundman\r\n\r\nMy Certificate Wizard - A tool to create a certificate request
by Vlada Macek\r\n\r\nNote that the Windows version of OpenVPN will only run on
Win 2000, XP, or higher.\r\n\r\n\r\n
++ !define WELCOMEPAGE_TEXT_OPENVPN OpenVPN - an Open Source VPN package by
James Yonan.\r\n\r\n
++ !define WELCOMEPAGE_TEXT_OPENVPNGUI OpenVPN GUI - A Graphical User
Interface for OpenVPN by Mathias Sundman\r\n\r\n
++!ifdef SKIP_MYCERT
++ !define WELCOMEPAGE_TEXT_MYCERT
++!else
++ !define WELCOMEPAGE_TEXT_MYCERT My Certificate Wizard - A tool to create a
certificate request by Vlada Macek\r\n\r\n
++!endif
++
++ !define MUI_WELCOMEPAGE_TEXT This wizard will guide you through the
installation
of:\r\n\r\n${WELCOMEPAGE_TEXT_OPENVPN}${WELCOMEPAGE_TEXT_OPENVPNGUI}${WELCOMEPAGE_TEXT_MYCERT}Note
that the Windows version of OpenVPN will only run on Win 2000, XP, or
higher.\r\n\r\n\r\n
+
+ !define MUI_COMPONENTSPAGE_TEXT_TOP Select the components to
install/upgrade. Stop any OpenVPN or OpenVPN GUI processes or the OpenVPN
service if it is running.
+
+@@ -231,6 +239,7 @@
SectionEnd
@@ -8,7 +25,7 @@
Section OpenVPN RSA Certificate Management Scripts SecOpenVPNEasyRSA
SetOverwrite on
-@@ -253,6 +254,7 @@
+@@ -253,6 +262,7 @@
File ${HOME}\easy-rsa\serial.start
SectionEnd
@@ -16,7 +33,7 @@
Section OpenVPN GUI SecGUI
-@@ -280,6 +282,7 @@
+@@ -280,6 +290,7 @@
Section AutoStart OpenVPN GUI SecGUIAuto
SectionEnd
@@ -24,7 +41,7 @@
Section My Certificate Wizard SecMYCERT
SetOverwrite on
-@@ -288,6 +291,7 @@
+@@ -288,6 +299,7 @@
File ${HOME}\mycertwizard\mycert.ini
SectionEnd
@@ -32,7 +49,7 @@
Section Hide the TAP-Win32 Virtual Ethernet Adapter SecTAPHidden
SectionEnd
-@@ -324,6 +328,7 @@
+@@ -324,6 +336,7 @@
Section OpenVPN File Associations SecFileAssociation
SectionEnd
@@ -40,7 +57,7 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
-@@ -340,6 +345,7 @@
+@@ -340,6 +353,7 @@
File ${BIN}\openssl.exe
SectionEnd
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - disable sample configs
Author: glen Date: Fri Dec 3 15:31:28 2010 GMT
Module: packages Tag: HEAD
Log message:
- disable sample configs
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.3 - 1.4)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.3
packages/nsis-openvpn/skip-components.patch:1.4
--- packages/nsis-openvpn/skip-components.patch:1.3 Fri Dec 3 16:22:29 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 16:31:23 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:10:53.461359172 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:18:50.417769474 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:18:50.417769474 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:27:41.688132777 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -33,7 +33,24 @@
Section OpenVPN GUI SecGUI
-@@ -280,6 +290,7 @@
+@@ -261,13 +271,15 @@
+ File ${HOME}\openvpn-gui.exe
+
+ # Include your custom config file(s) here.
+- SetOutPath $INSTDIR\config
++; SetOutPath $INSTDIR\config
+ ;File ${HOME}\config\Office.ovpn
+
++!ifndef SKIP_SAMPLE_CONFIG
+ SetOutPath $INSTDIR\sample-config
+ File ${HOME}\sample-config\sample.${SERV_CONFIG_EXT}
+ File ${HOME}\sample-config\client.${SERV_CONFIG_EXT}
+ File ${HOME}\sample-config\server.${SERV_CONFIG_EXT}
++!endif
+
+ SetOutPath $INSTDIR
+ File ${HOME}\install-win32\OpenVPN GUI ReadMe.txt
+@@ -280,6 +292,7 @@
Section AutoStart OpenVPN GUI SecGUIAuto
SectionEnd
@@ -41,7 +58,7 @@
Section My Certificate Wizard SecMYCERT
SetOverwrite on
-@@ -288,6 +299,7 @@
+@@ -288,6 +301,7 @@
File ${HOME}\mycertwizard\mycert.ini
SectionEnd
@@ -49,7 +66,21 @@
Section Hide the TAP-Win32 Virtual Ethernet Adapter SecTAPHidden
SectionEnd
-@@ -324,6 +336,7 @@
+@@ -307,11 +321,12 @@
+ FileWrite $R0 process will be instantiated for each configuration
file.$\r$\n
+ FileClose $R0
+
++!ifndef SKIP_SAMPLE_CONFIG
+ SetOutPath $INSTDIR\sample-config
+ File ${HOME}\sample-config\sample.${SERV_CONFIG_EXT}
+ File ${HOME}\sample-config\client.${SERV_CONFIG_EXT}
+ File ${HOME}\sample-config\server.${SERV_CONFIG_EXT}
+-
++!endif
+
+ CreateDirectory $INSTDIR\log
+ FileOpen $R0 $INSTDIR\log\README.txt w
+@@ -324,6 +339,7 @@
Section OpenVPN File Associations SecFileAssociation
SectionEnd
@@ -57,7 +88,7 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
-@@ -340,6 +353,7 @@
+@@ -340,6 +356,7 @@
File ${BIN}\openssl.exe
SectionEnd
@@ -65,3 +96,14 @@
Section TAP-Win32 Virtual Ethernet Adapter SecTAP
+@@ -643,8 +660,10 @@
+ CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN log file directory.lnk
$INSTDIR\log
+
+ samp_shortcut:
++!ifndef SKIP_SAMPLE_CONFIG
+ IfFileExists $INSTDIR\sample-config genkey_shortcut
+ CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN Sample Configuration
Files.lnk $INSTDIR\sample-config
++!endif
+
+ genkey_shortcut:
+ IfFileExists $INSTDIR\bin\openvpn.exe noshortcuts
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wine/wine-uninstaller.desktop - fix uninstaller desktop
Author: glen Date: Fri Dec 3 15:37:03 2010 GMT Module: packages Tag: HEAD Log message: - fix uninstaller desktop Files affected: packages/wine: wine-uninstaller.desktop (1.2 - 1.3) Diffs: Index: packages/wine/wine-uninstaller.desktop diff -u packages/wine/wine-uninstaller.desktop:1.2 packages/wine/wine-uninstaller.desktop:1.3 --- packages/wine/wine-uninstaller.desktop:1.2 Mon May 5 16:59:14 2008 +++ packages/wine/wine-uninstaller.desktop Fri Dec 3 16:36:58 2010 @@ -4,6 +4,6 @@ Name[pl]=Narzędzie usuwania aplikacji Wine Comment=Remove installed Wine applications Comment[pl]=Usuwanie zainstalowanych aplikacji Wine -Exec=uninstaller %f +Exec=wine uninstaller %f Icon=wine Categories=System; CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wine/wine-uninstaller.desktop?r1=1.2r2=1.3f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLD-doc: PLD-update-TODO - updated
Author: arekmDate: Fri Dec 3 15:39:03 2010 GMT Module: PLD-doc Tag: HEAD Log message: - updated Files affected: PLD-doc: PLD-update-TODO (1.1076 - 1.1077) Diffs: Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.1076 PLD-doc/PLD-update-TODO:1.1077 --- PLD-doc/PLD-update-TODO:1.1076 Fri Dec 3 08:55:48 2010 +++ PLD-doc/PLD-update-TODO Fri Dec 3 16:38:58 2010 @@ -97,7 +97,7 @@ asm(10) [OLD] 1.5.3 [NEW] 3.3 asm2(10) [OLD] 2.2.3 [NEW] 3.3 aspell-ga(11) [OLD] 4.4 [NEW] 4.5 -aspell-pl-alt(9) [OLD] 20100309 [NEW] 20101202 +aspell-pl-alt(9) [OLD] 20100309 [NEW] 20101203 asterisk-oh323(11) [OLD] 0.7.1 [NEW] 0.7.3 asterisk-perl(14) [OLD] 0.10 [NEW] 1.01 astyle(9) [OLD] 1.24 [NEW] 2.01 @@ -152,6 +152,7 @@ cacao(9) [OLD] 0.98 [NEW] 0.99.4 cacti-plugin-manage(11) [OLD] 0.6 [NEW] 0.6.2 cadaver(9) [OLD] 0.23.2 [NEW] 0.23.3 +cairo-dock(9) [OLD] 2.0.8 [NEW] 2.1.0 cairomm(9) [OLD] 1.8.6 [NEW] 1.9.6 camlp5(11) [OLD] 5.11 [NEW] 6.00 camlp5(9) [OLD] 5.11 [NEW] 6.02.0 @@ -499,7 +500,7 @@ hippo-canvas(9) [OLD] 0.3.0 [NEW] 0.3.1 homebank(8) [OLD] 4.0 [NEW] 4.3 hostapd(12) [OLD] 0.7.0 [NEW] 0.7.3 -howto(11) [OLD] 20100920 [NEW] 20101202 +howto(11) [OLD] 20100920 [NEW] 20101203 howto-html(11) [OLD] 20100920 [NEW] 20101202 htb-gen(13) [OLD] 0.8.3 [NEW] 0.9b html2ps(10) [OLD] 1.0b5 [NEW] 1.0b7 @@ -546,7 +547,7 @@ irrd(9) [OLD] 2.2.2 [NEW] 2.3.10 iscsitarget(17) [OLD] 1.4.19 [NEW] 1.4.20.2 iso-codes(9) [OLD] 3.22 [NEW] 3.23 -ispell-pl-alt(9) [OLD] 20100920 [NEW] 20101202 +ispell-pl-alt(9) [OLD] 20100920 [NEW] 20101203 ixgbe(27) [OLD] 2.1.4 [NEW] 3.0.14 jabberd(24) [OLD] 2.2.9 [NEW] 2.2.11 jack-rack(14) [OLD] 1.4.4 [NEW] 1.4.7 @@ -659,7 +660,6 @@ libHX(9) [OLD] 3.6 [NEW] 3.8 libapreq2(17) [OLD] 2.12 [NEW] 2.13 libassuan1(15) [OLD] 1.0.5 [NEW] 2.0.1 -libcgroup(10) [OLD] 0.36.1 [NEW] 0.37.rc1 libcue(8) [OLD] 1.3.0 [NEW] 1.4.0 libdomainkeys(9) [OLD] 0.68 [NEW] 0.69 libdumbtts(9) [OLD] 0.3.0 [NEW] 0.3.2 @@ -688,13 +688,9 @@ libtiff(16) [OLD] 3.9.4 [NEW] 4.0.0beta6 libva-driver-vdpau(9) [OLD] 0.7.1 [NEW] 0.7.3.pre1 libvirt(33) [OLD] 0.8.2 [NEW] 0.8.6 -libxtract(9) [OLD] 0.6.2 [NEW] 0.6.3 -libzen(9) [OLD] 0.4.15 [NEW] 0.4.16 libzrtpcpp(9) [OLD] 1.4.3 [NEW] 1.4.6 -licq(16) [OLD] 1.3.7 [NEW] 1.5.0 lilyterm(10) [OLD] 0.9.6 [NEW] 0.9.8 lingot(9) [OLD] 0.7.6 [NEW] 0.8.1 -linklint(10) [OLD] 2.3.5 [NEW] 2.4.beta linkloop(9) [OLD] 0.0.2 [NEW] 0.0.3 links(14) [OLD] 1.00 [NEW] 1.01pre1 links2(22) [OLD] 2.2 [NEW] 2.3pre1 @@ -713,7 +709,6 @@ lprof(14) [OLD] 1.09 [NEW] 1.11.4.1 lrzip(13) [OLD] 0.31 [NEW] 0.543 lshw(13) [OLD] B.02.15 [NEW] T.00.07 -lsvpd(9) [OLD] 1.0.3 [NEW] 1.6.10 lsyncd(8) [OLD] 1.26 [NEW] 2.0.0 ltspfs(9) [OLD] 0.5.12 [NEW] 0.7 lua40(11) [OLD] 4.0.1 [NEW] 5.1.4 @@ -729,18 +724,18 @@ mailfilter(9) [OLD] 0.6.2 [NEW] 0.8.2 mairix(10) [OLD] 0.21 [NEW] 0.22 majordomo(18) [OLD] 1.94.5 [NEW] 1.94.5.tar.Z.uu -man-pages(43) [OLD] 3.30 [NEW] 3.31 +man-pages(43) [OLD] 3.30 [NEW] 3.32 mapserver(19) [OLD] 4.10.2 [NEW] 5.6.5 masqmail(9) [OLD] 0.2.21 [NEW] 0.2.27 maxima(10) [OLD] 5.19.2 [NEW] 5.22.1 mbootpack(9) [OLD] 0.4a [NEW] 0.6a -mc(30) [OLD] 4.7.0 [NEW] 4.7.4 mcabber.spec:9: impossible substitution: http://www.lilotux.net/%7emikael/mcabber/files/mcabber-0.9.10.tar.bz2 mcron(12) [OLD] 1.0.4 [NEW] 1.0.6 mcs(9) [OLD] 0.7.1 [NEW] 0.7.2 md5deep(9) [OLD] 3.4 [NEW] 3.6 mecab(12) [OLD] 0.80 [NEW] 0.98 mediaproxy(9) [OLD] 2.3.8 [NEW] 2.4.4 +mediastreamer(8) [OLD] 2.3.0 [NEW] 2.6.0 medit(13) [OLD] 0.9.3 [NEW] 0.10.5 memtester(10) [OLD] 4.2.0 [NEW] 4.2.1 mercurial(18) [OLD] 1.6 [NEW] 1.7.2 @@ -904,11 +899,12 @@ perl-Moose-Autobox(17) [OLD] 0.10 [NEW] 0.11 perl-MooseX-MethodAttributes(17) [OLD] 0.20 [NEW] 0.23 perl-Mouse(16) [OLD] 0.50 [NEW] 0.4501 -perl-Nagios-Plugin(17) [OLD] 0.33 [NEW] 0.34 +perl-Nagios-Plugin(17) [OLD] 0.33 [NEW] 0.35 perl-Net-SSH2(33) [OLD] 0.29 [NEW] 0.33 perl-OWNet(16) [OLD] 1.8 [NEW] 1.20 perl-PDL(22) [OLD] 2.4.6 [NEW] 2.4.7 perl-POE-Component-Jabber(16) [OLD] 1.21 [NEW] 3.00 +perl-POE-Component-Pluggable(17) [OLD] 1.24 [NEW] 1.26 perl-PadWalker(16) [OLD] 1.9 [NEW] 1.92 perl-Params-Validate(17) [OLD] 0.92 [NEW] 0.95 perl-Path-Class(19) [OLD] 0.18 [NEW] 0.21 @@ -935,6 +931,7 @@ perl-libapreq(14) [OLD] 1.33 [NEW] 1.34 perl-local-lib(17) [OLD] 1.005001 [NEW] 1.006008 perl-mixin(15) [OLD] 0.06 [NEW] 0.07 +perl-namespace-autoclean(17) [OLD] 0.09 [NEW] 0.11 perl-version(17) [OLD] 0.85 [NEW] 0.7702 pessulus(9) [OLD] 2.30.2 [NEW] 2.30.4 pfstools(14) [OLD] 1.6.2 [NEW] 1.8.2 @@ -1043,7 +1040,7 @@ python-PalmDB(12) [OLD] 1.4.1 [NEW] 1.8.1 python-Paste(9) [OLD] 1.7.2 [NEW] 1.7.5.1 python-PasteDeploy(9) [OLD] 1.3.3 [NEW] 1.3.4dev -python-PyKCS11(10) [OLD] 1.2.1 [NEW] 1.2.2 +python-PyKCS11(10) [OLD] 1.2.1 [NEW] 1.2.3 python-PyQt4(16) [OLD] 4.8 [NEW] 4.8.1 python-PyXB.spec:9: impossible substitution: http
packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/options-override.pat...
Author: glen Date: Fri Dec 3 15:48:16 2010 GMT
Module: packages Tag: HEAD
Log message:
- allow override options from cmdline, icons for now
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (1.3 - 1.4) , options-override.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.3
packages/nsis-openvpn/nsis-openvpn.spec:1.4
--- packages/nsis-openvpn/nsis-openvpn.spec:1.3 Fri Dec 3 16:00:33 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 16:48:11 2010
@@ -2,7 +2,7 @@
Summary: NSIS OpenVPN installer builder
Name: nsis-openvpn
Version: 2.0.9
-Release: 0.3
+Release: 0.7
# OpenVPN windows executable is GPL, no ideas about the rest
License: GPL
Group: Development/Tools
@@ -12,6 +12,7 @@
NoSource: 0
Patch0:nsis-constants.patch
Patch1:skip-components.patch
+Patch2:options-override.patch
BuildRequires: rpmbuild(macros) = 1.553
BuildRequires: unix2dos
Requires: nsis = 2.34
@@ -29,6 +30,7 @@
%undos openvpn-gui.nsi
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
unix2dos openvpn-gui.nsi
@@ -53,6 +55,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.4 2010/12/03 15:48:11 glen
+- allow override options from cmdline, icons for now
+
Revision 1.3 2010/12/03 15:00:33 glen
- allow skipping some components
Index: packages/nsis-openvpn/options-override.patch
diff -u /dev/null packages/nsis-openvpn/options-override.patch:1.1
--- /dev/null Fri Dec 3 16:48:16 2010
+++ packages/nsis-openvpn/options-override.patchFri Dec 3 16:48:11 2010
@@ -0,0 +1,42 @@
+--- OpenVPN/openvpn-gui.nsi2010-12-03 17:31:12.0 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:45:58.538023345 +0200
+@@ -98,10 +98,18 @@
+ !define MUI_FINISHPAGE_NOAUTOCLOSE
+ !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+ !define MUI_ABORTWARNING
++!ifndef ICON
+ !define MUI_ICON ${HOME}\install-win32\openvpn.ico
+- !define MUI_UNICON ${HOME}\install-win32\openvpn.ico
++!else
++ !define MUI_ICON ${ICON}
++!endif
++ !define MUI_UNICON ${MUI_ICON}
+ !define MUI_HEADERIMAGE
++!ifndef HEADERIMAGE_BITMAP
+ !define MUI_HEADERIMAGE_BITMAP ${HOME}\install-win32\install-whirl.bmp
++!else
++ !define MUI_HEADERIMAGE_BITMAP ${HEADERIMAGE_BITMAP}
++!endif
+ !define MUI_UNFINISHPAGE_NOAUTOCLOSE
+
+ !define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
+@@ -174,8 +182,8 @@
+
+ ;Things that need to be extracted on first (keep these lines before any
File command!)
+ ;Only useful for BZIP2 compression
+-
+- ReserveFile ${HOME}\install-win32\install-whirl.bmp
++
++ ReserveFile ${MUI_HEADERIMAGE_BITMAP}
+
+ ;
+ ;Macros
+@@ -621,7 +629,7 @@
+ SetOutPath $INSTDIR
+ File ${HOME}\install-win32\INSTALL-win32.txt
+ File ${HOME}\install-win32\license.txt
+- File ${HOME}\install-win32\openvpn.ico
++ File /oname=openvpn.ico ${MUI_ICON}
+
+ ; Create file association if requested
+ SectionGetFlags ${SecFileAssociation} $R0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.3r2=1.4f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - keep openssl dll-s
Author: glen Date: Fri Dec 3 16:08:20 2010 GMT
Module: packages Tag: HEAD
Log message:
- keep openssl dll-s
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.4 - 1.5)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.4
packages/nsis-openvpn/skip-components.patch:1.5
--- packages/nsis-openvpn/skip-components.patch:1.4 Fri Dec 3 16:31:23 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:08:15 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:18:50.417769474 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:27:41.688132777 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:27:41.688132777 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:06:57.143939787 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -88,13 +88,13 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
-@@ -340,6 +356,7 @@
- File ${BIN}\openssl.exe
+@@ -344,6 +360,7 @@
+ File ${BIN}\libssl32.dll
SectionEnd
+!endif
- Section TAP-Win32 Virtual Ethernet Adapter SecTAP
+ Section OpenSSL Utilities SecOpenSSLUtilities
@@ -643,8 +660,10 @@
CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN log file directory.lnk
$INSTDIR\log
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - skip macros define as well
Author: glen Date: Fri Dec 3 16:23:46 2010 GMT
Module: packages Tag: HEAD
Log message:
- skip macros define as well
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.5 - 1.6)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.5
packages/nsis-openvpn/skip-components.patch:1.6
--- packages/nsis-openvpn/skip-components.patch:1.5 Fri Dec 3 17:08:15 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:23:41 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 17:27:41.688132777 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:06:57.143939787 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:06:57.143939787 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:21:19.450540816 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -17,7 +17,17 @@
!define MUI_COMPONENTSPAGE_TEXT_TOP Select the components to
install/upgrade. Stop any OpenVPN or OpenVPN GUI processes or the OpenVPN
service if it is running.
-@@ -231,6 +239,7 @@
+@@ -163,7 +171,9 @@
+
+ LangString DESC_SecGUIAuto ${LANG_ENGLISH} Automatically start OpenVPN GUI
at system startup
+
++!ifndef SKIP_MYCERT
+ LangString DESC_SecMYCERT ${LANG_ENGLISH} Install My Certificate Wizard -
A tool to create a certificate request.
++!endif
+ ;
+ ;Data
+
+@@ -231,6 +241,7 @@
SectionEnd
@@ -25,7 +35,7 @@
Section OpenVPN RSA Certificate Management Scripts SecOpenVPNEasyRSA
SetOverwrite on
-@@ -253,6 +262,7 @@
+@@ -253,6 +264,7 @@
File ${HOME}\easy-rsa\serial.start
SectionEnd
@@ -33,7 +43,7 @@
Section OpenVPN GUI SecGUI
-@@ -261,13 +271,15 @@
+@@ -261,13 +273,15 @@
File ${HOME}\openvpn-gui.exe
# Include your custom config file(s) here.
@@ -50,7 +60,7 @@
SetOutPath $INSTDIR
File ${HOME}\install-win32\OpenVPN GUI ReadMe.txt
-@@ -280,6 +292,7 @@
+@@ -280,6 +294,7 @@
Section AutoStart OpenVPN GUI SecGUIAuto
SectionEnd
@@ -58,7 +68,7 @@
Section My Certificate Wizard SecMYCERT
SetOverwrite on
-@@ -288,6 +301,7 @@
+@@ -288,6 +303,7 @@
File ${HOME}\mycertwizard\mycert.ini
SectionEnd
@@ -66,7 +76,7 @@
Section Hide the TAP-Win32 Virtual Ethernet Adapter SecTAPHidden
SectionEnd
-@@ -307,11 +321,12 @@
+@@ -307,11 +323,12 @@
FileWrite $R0 process will be instantiated for each configuration
file.$\r$\n
FileClose $R0
@@ -80,7 +90,7 @@
CreateDirectory $INSTDIR\log
FileOpen $R0 $INSTDIR\log\README.txt w
-@@ -324,6 +339,7 @@
+@@ -324,6 +341,7 @@
Section OpenVPN File Associations SecFileAssociation
SectionEnd
@@ -88,7 +98,7 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
-@@ -344,6 +360,7 @@
+@@ -344,6 +362,7 @@
File ${BIN}\libssl32.dll
SectionEnd
@@ -96,7 +106,23 @@
Section OpenSSL Utilities SecOpenSSLUtilities
-@@ -643,8 +660,10 @@
+@@ -443,6 +462,7 @@
+
+ nogui:
+
++!ifndef SKIP_MYCERT
+ SectionGetFlags ${SecMYCERT} $R0
+ IntOp $R0 $R0 ${SF_SELECTED}
+ IntCmp $R0 ${SF_SELECTED} nomycert nomycert
+@@ -450,6 +470,7 @@
+ CreateShortCut $SMPROGRAMS\OpenVPN\My Certificate Wizard.lnk
$INSTDIR\bin\mycert.exe
+
+ nomycert:
++!endif
+
+ SectionEnd
+
+@@ -643,8 +664,10 @@
CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN log file directory.lnk
$INSTDIR\log
samp_shortcut:
@@ -107,3 +133,29 @@
genkey_shortcut:
IfFileExists $INSTDIR\bin\openvpn.exe noshortcuts
+@@ -680,10 +703,14 @@
+
+ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNUserSpace}
$(DESC_SecOpenVPNUserSpace)
++!ifndef SKIP_EASYRSA
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNEasyRSA}
$(DESC_SecOpenVPNEasyRSA)
++!endif
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecGUI} $(DESC_SecGUI)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecGUIAuto} $(DESC_SecGUIAuto)
++!ifndef SKIP_MYCERT
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecMYCERT} $(DESC_SecMYCERT)
++!endif
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecTAPHidden} $(DESC_SecTAPHidden)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities}
$(DESC_SecOpenSSLUtilities)
+@@ -733,8 +760,10 @@
+ Pop $R1
+ Pop $R0
+
++!ifndef SKIP_MYCERT
+ ;Disable My Certificate Wizard as default.
+ SectionSetFlags ${SecMYCERT} 0
++!endif
+
+ ; Don't install the TAP driver as hiddden as default.
+ SectionSetFlags ${SecTAPHidden} 0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.5r2=1.6f=u
___
pld-cvs-commit mailing list
packages: nsis-openvpn/skip-components.patch - rediff
Author: glen Date: Fri Dec 3 16:28:43 2010 GMT
Module: packages Tag: HEAD
Log message:
- rediff
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.6 - 1.7)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.6
packages/nsis-openvpn/skip-components.patch:1.7
--- packages/nsis-openvpn/skip-components.patch:1.6 Fri Dec 3 17:23:41 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:28:38 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:06:57.143939787 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:21:19.450540816 +0200
+--- nsis-openvpn-2.0.9-1/openvpn-gui.nsi 2010-12-03 18:26:58.650486303
+0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:27:11.547377149 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -17,7 +17,7 @@
!define MUI_COMPONENTSPAGE_TEXT_TOP Select the components to
install/upgrade. Stop any OpenVPN or OpenVPN GUI processes or the OpenVPN
service if it is running.
-@@ -163,7 +171,9 @@
+@@ -155,7 +163,9 @@
LangString DESC_SecGUIAuto ${LANG_ENGLISH} Automatically start OpenVPN GUI
at system startup
@@ -98,7 +98,7 @@
Section OpenSSL DLLs SecOpenSSLDLLs
SetOverwrite on
-@@ -344,6 +362,7 @@
+@@ -332,6 +350,7 @@
File ${BIN}\libssl32.dll
SectionEnd
@@ -106,7 +106,7 @@
Section OpenSSL Utilities SecOpenSSLUtilities
-@@ -443,6 +462,7 @@
+@@ -435,6 +454,7 @@
nogui:
@@ -114,7 +114,7 @@
SectionGetFlags ${SecMYCERT} $R0
IntOp $R0 $R0 ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} nomycert nomycert
-@@ -450,6 +470,7 @@
+@@ -442,6 +462,7 @@
CreateShortCut $SMPROGRAMS\OpenVPN\My Certificate Wizard.lnk
$INSTDIR\bin\mycert.exe
nomycert:
@@ -133,7 +133,7 @@
genkey_shortcut:
IfFileExists $INSTDIR\bin\openvpn.exe noshortcuts
-@@ -680,10 +703,14 @@
+@@ -672,10 +695,14 @@
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNUserSpace}
$(DESC_SecOpenVPNUserSpace)
@@ -148,7 +148,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAPHidden} $(DESC_SecTAPHidden)
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities}
$(DESC_SecOpenSSLUtilities)
-@@ -733,8 +760,10 @@
+@@ -725,8 +752,10 @@
Pop $R1
Pop $R0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.6r2=1.7f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: adobe-flash/adobe-flash.spec - 10.3.162.29 for 64bit
Author: arekmDate: Fri Dec 3 16:31:21 2010 GMT
Module: packages Tag: HEAD
Log message:
- 10.3.162.29 for 64bit
Files affected:
packages/adobe-flash:
adobe-flash.spec (1.142 - 1.143)
Diffs:
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.142
packages/adobe-flash/adobe-flash.spec:1.143
--- packages/adobe-flash/adobe-flash.spec:1.142 Sat Oct 2 18:50:06 2010
+++ packages/adobe-flash/adobe-flash.spec Fri Dec 3 17:31:15 2010
@@ -5,9 +5,9 @@
%ifarch %{x8664}
%definever_major 10
-%definever_minor 2
-%definever_patch 161
-%definever_serial 23
+%definever_minor 3
+%definever_patch 162
+%definever_serial 29
%definelibmark ()(64bit)
%else
%definever_major 10
@@ -33,12 +33,12 @@
Group: X11/Applications/Multimedia
%if %{with license_agreement}
##Source0:
http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
-Source0:
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_linux_092710.tar.gz
-# NoSource0-md5: b3cc7671ce5e62a687e7a22555f08611
+Source0:
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_111710.tar.gz
+# NoSource0-md5: 3a5c1e0a77bb44d3456c933a056bcf47
NoSource: 0
##Source1:
http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-%{version}.linux-x86_64.so.tar.gz
-Source1:
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_64bit_linux_092710.tar.gz
-# NoSource1-md5: a735a3c581337ed2a06a20714846645e
+Source1:
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz
+# NoSource1-md5: 49b55c7eb8044453e5f6f2e4b3cb4084
NoSource: 1
%else
Source2:
http://svn.pld-linux.org/svn/license-installer/license-installer.sh
@@ -161,6 +161,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.143 2010/12/03 16:31:15 arekm
+- 10.3.162.29 for 64bit
+
Revision 1.142 2010/10/02 16:50:06 arekm
- up to 10.2.161.23 by Daniel Dawid Majewski
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/adobe-flash.spec?r1=1.142r2=1.143f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - make sample configs .lnk if ...
Author: glen Date: Fri Dec 3 16:33:48 2010 GMT Module: packages Tag: HEAD Log message: - make sample configs .lnk if dir present Files affected: packages/nsis-openvpn: skip-components.patch (1.7 - 1.8) Diffs: Index: packages/nsis-openvpn/skip-components.patch diff -u packages/nsis-openvpn/skip-components.patch:1.7 packages/nsis-openvpn/skip-components.patch:1.8 --- packages/nsis-openvpn/skip-components.patch:1.7 Fri Dec 3 17:28:38 2010 +++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:33:42 2010 @@ -122,17 +122,6 @@ SectionEnd -@@ -643,8 +664,10 @@ - CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN log file directory.lnk $INSTDIR\log - - samp_shortcut: -+!ifndef SKIP_SAMPLE_CONFIG - IfFileExists $INSTDIR\sample-config genkey_shortcut - CreateShortCut $SMPROGRAMS\OpenVPN\OpenVPN Sample Configuration Files.lnk $INSTDIR\sample-config -+!endif - - genkey_shortcut: - IfFileExists $INSTDIR\bin\openvpn.exe noshortcuts @@ -672,10 +695,14 @@ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.7r2=1.8f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - fix openssl skip (want to sk...
Author: glen Date: Fri Dec 3 16:35:29 2010 GMT
Module: packages Tag: HEAD
Log message:
- fix openssl skip (want to skip .exe, not lib)
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.8 - 1.9)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.8
packages/nsis-openvpn/skip-components.patch:1.9
--- packages/nsis-openvpn/skip-components.patch:1.8 Fri Dec 3 17:33:42 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:35:23 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9-1/openvpn-gui.nsi 2010-12-03 18:26:58.650486303
+0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:27:11.547377149 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:27:11.547377149 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:34:31.377120791 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -90,23 +90,23 @@
CreateDirectory $INSTDIR\log
FileOpen $R0 $INSTDIR\log\README.txt w
-@@ -324,6 +341,7 @@
- Section OpenVPN File Associations SecFileAssociation
+@@ -341,6 +358,7 @@
+
SectionEnd
+!ifndef SKIP_OPENSSL
- Section OpenSSL DLLs SecOpenSSLDLLs
+ Section OpenSSL Utilities SecOpenSSLUtilities
SetOverwrite on
-@@ -332,6 +350,7 @@
- File ${BIN}\libssl32.dll
+@@ -348,6 +366,7 @@
+ File ${BIN}\openssl.exe
SectionEnd
+!endif
- Section OpenSSL Utilities SecOpenSSLUtilities
+ Section TAP-Win32 Virtual Ethernet Adapter SecTAP
-@@ -435,6 +454,7 @@
+@@ -437,6 +456,7 @@
nogui:
@@ -114,7 +114,7 @@
SectionGetFlags ${SecMYCERT} $R0
IntOp $R0 $R0 ${SF_SELECTED}
IntCmp $R0 ${SF_SELECTED} nomycert nomycert
-@@ -442,6 +462,7 @@
+@@ -444,6 +464,7 @@
CreateShortCut $SMPROGRAMS\OpenVPN\My Certificate Wizard.lnk
$INSTDIR\bin\mycert.exe
nomycert:
@@ -122,7 +122,7 @@
SectionEnd
-@@ -672,10 +695,14 @@
+@@ -676,10 +697,14 @@
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNUserSpace}
$(DESC_SecOpenVPNUserSpace)
@@ -137,7 +137,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAPHidden} $(DESC_SecTAPHidden)
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities}
$(DESC_SecOpenSSLUtilities)
-@@ -725,8 +752,10 @@
+@@ -729,8 +754,10 @@
Pop $R1
Pop $R0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.8r2=1.9f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/skip-components.patch - fix
Author: glen Date: Fri Dec 3 16:40:34 2010 GMT
Module: packages Tag: HEAD
Log message:
- fix
Files affected:
packages/nsis-openvpn:
skip-components.patch (1.9 - 1.10)
Diffs:
Index: packages/nsis-openvpn/skip-components.patch
diff -u packages/nsis-openvpn/skip-components.patch:1.9
packages/nsis-openvpn/skip-components.patch:1.10
--- packages/nsis-openvpn/skip-components.patch:1.9 Fri Dec 3 17:35:23 2010
+++ packages/nsis-openvpn/skip-components.patch Fri Dec 3 17:40:29 2010
@@ -1,5 +1,5 @@
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:27:11.547377149 +0200
-+++ nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:34:31.377120791 +0200
+--- nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:34:31.377120791 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 18:36:25.740428053 +0200
@@ -106,7 +106,15 @@
!define MUI_WELCOMEPAGE_TITLE Welcome to the ${PRODUCT_NAME} Setup Wizard
@@ -122,7 +122,7 @@
SectionEnd
-@@ -676,10 +697,14 @@
+@@ -693,13 +693,19 @@
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNUserSpace}
$(DESC_SecOpenVPNUserSpace)
@@ -136,8 +136,13 @@
+!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAP} $(DESC_SecTAP)
!insertmacro MUI_DESCRIPTION_TEXT ${SecTAPHidden} $(DESC_SecTAPHidden)
++!ifndef SKIP_OPENSSL
!insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLUtilities}
$(DESC_SecOpenSSLUtilities)
-@@ -729,8 +754,10 @@
++!endif
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenSSLDLLs} $(DESC_SecOpenSSLDLLs)
+ ; !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenVPNSource}
$(DESC_SecOpenVPNSource)
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecAddPath} $(DESC_SecAddPath)
+@@ -729,8 +756,10 @@
Pop $R1
Pop $R0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/skip-components.patch?r1=1.9r2=1.10f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/defaults.patch (NEW)...
Author: glen Date: Fri Dec 3 17:06:44 2010 GMT
Module: packages Tag: HEAD
Log message:
- change a bit defaults
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (1.4 - 1.5) , defaults.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.4
packages/nsis-openvpn/nsis-openvpn.spec:1.5
--- packages/nsis-openvpn/nsis-openvpn.spec:1.4 Fri Dec 3 16:48:11 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 18:06:39 2010
@@ -2,7 +2,7 @@
Summary: NSIS OpenVPN installer builder
Name: nsis-openvpn
Version: 2.0.9
-Release: 0.7
+Release: 0.15
# OpenVPN windows executable is GPL, no ideas about the rest
License: GPL
Group: Development/Tools
@@ -13,6 +13,7 @@
Patch0:nsis-constants.patch
Patch1:skip-components.patch
Patch2:options-override.patch
+Patch3:defaults.patch
BuildRequires: rpmbuild(macros) = 1.553
BuildRequires: unix2dos
Requires: nsis = 2.34
@@ -31,6 +32,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
unix2dos openvpn-gui.nsi
@@ -55,6 +57,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.5 2010/12/03 17:06:39 glen
+- change a bit defaults
+
Revision 1.4 2010/12/03 15:48:11 glen
- allow override options from cmdline, icons for now
Index: packages/nsis-openvpn/defaults.patch
diff -u /dev/null packages/nsis-openvpn/defaults.patch:1.1
--- /dev/null Fri Dec 3 18:06:45 2010
+++ packages/nsis-openvpn/defaults.patchFri Dec 3 18:06:39 2010
@@ -0,0 +1,17 @@
+--- OpenVPN/openvpn-gui.nsi2010-12-03 18:38:41.0 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 19:05:29.673621527 +0200
+@@ -765,8 +765,14 @@
+ SectionSetFlags ${SecMYCERT} 0
+ !endif
+
++ ; Don't install OpenVPN service by default
++ SectionSetFlags ${SecService} 0
++
+ ; Don't install the TAP driver as hiddden as default.
+ SectionSetFlags ${SecTAPHidden} 0
++
++ ; Don't include OpenVPN to PATH by default
++ SectionSetFlags ${SecAddPath} 0
+ FunctionEnd
+
+ Function .onSelChange
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.4r2=1.5f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nsis-openvpn/nsis-openvpn.spec, nsis-openvpn/install-hook.patch (...
Author: glen Date: Fri Dec 3 17:14:54 2010 GMT
Module: packages Tag: HEAD
Log message:
- -DEXTRA_INSTALL_NSI=install.nsi support
Files affected:
packages/nsis-openvpn:
nsis-openvpn.spec (1.5 - 1.6) , install-hook.patch (NONE - 1.1) (NEW)
Diffs:
Index: packages/nsis-openvpn/nsis-openvpn.spec
diff -u packages/nsis-openvpn/nsis-openvpn.spec:1.5
packages/nsis-openvpn/nsis-openvpn.spec:1.6
--- packages/nsis-openvpn/nsis-openvpn.spec:1.5 Fri Dec 3 18:06:39 2010
+++ packages/nsis-openvpn/nsis-openvpn.spec Fri Dec 3 18:14:49 2010
@@ -2,7 +2,7 @@
Summary: NSIS OpenVPN installer builder
Name: nsis-openvpn
Version: 2.0.9
-Release: 0.15
+Release: 0.16
# OpenVPN windows executable is GPL, no ideas about the rest
License: GPL
Group: Development/Tools
@@ -14,6 +14,7 @@
Patch1:skip-components.patch
Patch2:options-override.patch
Patch3:defaults.patch
+Patch4:install-hook.patch
BuildRequires: rpmbuild(macros) = 1.553
BuildRequires: unix2dos
Requires: nsis = 2.34
@@ -33,6 +34,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
unix2dos openvpn-gui.nsi
@@ -57,6 +59,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.6 2010/12/03 17:14:49 glen
+- -DEXTRA_INSTALL_NSI=install.nsi support
+
Revision 1.5 2010/12/03 17:06:39 glen
- change a bit defaults
Index: packages/nsis-openvpn/install-hook.patch
diff -u /dev/null packages/nsis-openvpn/install-hook.patch:1.1
--- /dev/null Fri Dec 3 18:14:54 2010
+++ packages/nsis-openvpn/install-hook.patchFri Dec 3 18:14:49 2010
@@ -0,0 +1,14 @@
+--- OpenVPN/openvpn-gui.nsi2010-12-03 18:38:41.0 +0200
nsis-openvpn-2.0.9/openvpn-gui.nsi 2010-12-03 19:12:55.920210179 +0200
+@@ -291,6 +291,11 @@
+ File ${HOME}\sample-config\server.${SERV_CONFIG_EXT}
+ !endif
+
++; Extra install hooks included here
++!ifdef EXTRA_INSTALL_NSI
++ !include EXTRA_INSTALL_NSI
++!endif
++
+ SetOutPath $INSTDIR
+ File ${HOME}\install-win32\OpenVPN GUI ReadMe.txt
+
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nsis-openvpn/nsis-openvpn.spec?r1=1.5r2=1.6f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apertium-dict-fr-es/apertium-dict-fr-es.spec - proper desc
Author: qboosh Date: Fri Dec 3 17:16:10 2010 GMT
Module: packages Tag: HEAD
Log message:
- proper desc
Files affected:
packages/apertium-dict-fr-es:
apertium-dict-fr-es.spec (1.1 - 1.2)
Diffs:
Index: packages/apertium-dict-fr-es/apertium-dict-fr-es.spec
diff -u packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.1
packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.2
--- packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.1 Thu Dec 2
18:57:44 2010
+++ packages/apertium-dict-fr-es/apertium-dict-fr-es.spec Fri Dec 3
18:16:04 2010
@@ -23,12 +23,14 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Apertium is a free/open-source platform for developing rule-based
-machine translation systems.
+This is an Apertium language pair, which can be used for translating
+between French and Spanish, morphological analysis or part-of-speech
+tagging of both languages.
%description -l pl.UTF-8
-Apertium to wolnodostępna platforma do tworzenia maszynowych systemów
-tłumaczących opartych na regułach.
+Ten pakiet zawiera parę języków dla Apertium służącą do tłumaczenia
+między francuskim a hiszpańskim, a także analizy morfologicznej lub
+oznaczania części mowy w obu językach.
%prep
%setup -q -n apertium-%{lpair}-%{version}
@@ -71,5 +73,8 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.2 2010/12/03 17:16:04 qboosh
+- proper desc
+
Revision 1.1 2010/12/02 17:57:44 qboosh
- new package
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apertium-dict-fr-es/apertium-dict-fr-es.spec?r1=1.1r2=1.2f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: crossmingw32-freetype/crossmingw32-freetype.spec - updated to 2.4...
Author: qboosh Date: Fri Dec 3 17:17:11 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 2.4.4 (fixes CVE-2010-3855)
Files affected:
packages/crossmingw32-freetype:
crossmingw32-freetype.spec (1.21 - 1.22)
Diffs:
Index: packages/crossmingw32-freetype/crossmingw32-freetype.spec
diff -u packages/crossmingw32-freetype/crossmingw32-freetype.spec:1.21
packages/crossmingw32-freetype/crossmingw32-freetype.spec:1.22
--- packages/crossmingw32-freetype/crossmingw32-freetype.spec:1.21 Wed Oct
6 09:02:54 2010
+++ packages/crossmingw32-freetype/crossmingw32-freetype.spec Fri Dec 3
18:17:06 2010
@@ -7,12 +7,12 @@
Summary: TrueType font rasterizer - MinGW32 cross version
Summary(pl.UTF-8): Rasteryzer fontów TrueType - wersja skrośna dla MinGW32
Name: crossmingw32-%{realname}
-Version: 2.4.3
+Version: 2.4.4
Release: 1
License: GPL or FTL
Group: Development/Libraries
Source0:
http://downloads.sourceforge.net/freetype/%{realname}-%{version}.tar.bz2
-# Source0-md5: 75ac7082bde7b3805dc5d6bc806fa045
+# Source0-md5: b3e2b6e2f1c3e0dffa1fd2a0f848b671
URL: http://www.freetype.org/
BuildRequires: crossmingw32-gcc
BuildRequires: crossmingw32-zlib = 1.2.3-2
@@ -154,6 +154,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.22 2010/12/03 17:17:06 qboosh
+- updated to 2.4.4 (fixes CVE-2010-3855)
+
Revision 1.21 2010/10/06 07:02:54 qboosh
- updated to 2.4.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-freetype/crossmingw32-freetype.spec?r1=1.21r2=1.22f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-cheetah: Cheetah-2.2.1.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/cheetahtemplate/Cheetah-2.2.1.tar.gz 137491aef378b502b2ee71c03b929faf Cheetah-2.2.1.tar.gz Size: 243565 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: python-cheetah/python-cheetah.spec - updated to 2.2.1
Author: qboosh Date: Fri Dec 3 17:38:57 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 2.2.1
Files affected:
packages/python-cheetah:
python-cheetah.spec (1.38 - 1.39)
Diffs:
Index: packages/python-cheetah/python-cheetah.spec
diff -u packages/python-cheetah/python-cheetah.spec:1.38
packages/python-cheetah/python-cheetah.spec:1.39
--- packages/python-cheetah/python-cheetah.spec:1.38Thu Jul 8 10:02:59 2010
+++ packages/python-cheetah/python-cheetah.spec Fri Dec 3 18:38:52 2010
@@ -2,16 +2,15 @@
Summary: Python-powered template engine and code-generator
Summary(pl.UTF-8): System szablonów dla języka Python
Name: python-cheetah
-Version: 2.0.1
-Release: 4
-License: Python
+Version: 2.2.1
+Release: 1
+License: MIT
Group: Libraries/Python
-Source0:
http://dl.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
-# Source0-md5: 7845a2950ea850a13c488a26b61ac50a
+Source0:
http://downloads.sourceforge.net/cheetahtemplate/Cheetah-%{version}.tar.gz
+# Source0-md5: 137491aef378b502b2ee71c03b929faf
URL: http://www.cheetahtemplate.org/
BuildRequires: python = 2.2.1
BuildRequires: python-devel = 2.2.1
-BuildRequires: python-setuptools = 0.6-0.a9.1
BuildRequires: rpmbuild(macros) = 1.219
%pyrequires_eq python-modules
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,13 +25,12 @@
%setup -q -n Cheetah-%{version}
%build
-python setup.py build
+%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
-export CHEETAH_USE_SETUPTOOLS=1
-python setup.py install \
- --single-version-externally-managed \
+
+%{__python} setup.py install \
--optimize=2 \
--root=$RPM_BUILD_ROOT
@@ -43,37 +41,39 @@
%files
%defattr(644,root,root,755)
-%doc README
+%doc CHANGES LICENSE README TODO
+%attr(755,root,root) %{_bindir}/cheetah
+%attr(755,root,root) %{_bindir}/cheetah-compile
%dir %{py_sitedir}/Cheetah
-%dir %{py_sitedir}/Cheetah/Macros
-%dir %{py_sitedir}/Cheetah/Templates
-%dir %{py_sitedir}/Cheetah/Tests
-%dir %{py_sitedir}/Cheetah/Tools
-%dir %{py_sitedir}/Cheetah/Utils
-%dir %{py_sitedir}/Cheetah/Utils/optik
-
%{py_sitedir}/Cheetah/*.py[oc]
-%{py_sitedir}/Cheetah/*.so
+%attr(755,root,root) %{py_sitedir}/Cheetah/_namemapper.so
+%dir %{py_sitedir}/Cheetah/Macros
%{py_sitedir}/Cheetah/Macros/*.py[oc]
+%dir %{py_sitedir}/Cheetah/Templates
%{py_sitedir}/Cheetah/Templates/*.py[oc]
%{py_sitedir}/Cheetah/Templates/*.tmpl
+%dir %{py_sitedir}/Cheetah/Tests
%{py_sitedir}/Cheetah/Tests/*.py[oc]
+%dir %{py_sitedir}/Cheetah/Tools
%{py_sitedir}/Cheetah/Tools/*.py[oc]
%{py_sitedir}/Cheetah/Tools/*.txt
+%dir %{py_sitedir}/Cheetah/Utils
%{py_sitedir}/Cheetah/Utils/*.py[oc]
-%{py_sitedir}/Cheetah/Utils/optik/*.py[oc]
+%dir %{py_sitedir}/Cheetah/contrib
+%{py_sitedir}/Cheetah/contrib/*.py[oc]
+%dir %{py_sitedir}/Cheetah/contrib/markdown
+%{py_sitedir}/Cheetah/contrib/markdown/*.py[oc]
%{py_sitedir}/Cheetah-*.egg-info
-%attr(755,root,root) %{_bindir}/cheetah
-%attr(755,root,root) %{_bindir}/cheetah-compile
-
-
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
* %{date} PLD Team feedb...@pld-linux.org
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.39 2010/12/03 17:38:52 qboosh
+- updated to 2.2.1
+
Revision 1.38 2010/07/08 08:02:59 arekm
- release 4
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-cheetah/python-cheetah.spec?r1=1.38r2=1.39f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: python-pyparsing/python-pyparsing.spec - updated to 1.5.5
Author: qboosh Date: Fri Dec 3 18:21:08 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 1.5.5
Files affected:
packages/python-pyparsing:
python-pyparsing.spec (1.15 - 1.16)
Diffs:
Index: packages/python-pyparsing/python-pyparsing.spec
diff -u packages/python-pyparsing/python-pyparsing.spec:1.15
packages/python-pyparsing/python-pyparsing.spec:1.16
--- packages/python-pyparsing/python-pyparsing.spec:1.15Thu Jul 8
10:34:07 2010
+++ packages/python-pyparsing/python-pyparsing.spec Fri Dec 3 19:21:03 2010
@@ -5,12 +5,12 @@
Summary: pyparsing - a Python module for creating executing simple
grammars
Summary(pl.UTF-8): pyparsing - moduł Pythona umożliwiający tworzenie i
parsowanie prostych gramatyk
Name: python-%{module}
-Version: 1.5.1
-Release: 2
+Version: 1.5.5
+Release: 1
License: MIT
Group: Libraries/Python
-Source0: http://dl.sourceforge.net/pyparsing/%{module}-%{version}.tar.gz
-# Source0-md5: d0777821fc4c5f2474cda1081229d76b
+Source0:
http://downloads.sourceforge.net/pyparsing/%{module}-%{version}.tar.gz
+# Source0-md5: 0beba391cba3082d7914c289bffa52ce
URL: http://pyparsing.sourceforge.net/
BuildRequires: python-devel = 1:2.5
BuildRequires: python-modules
@@ -61,13 +61,13 @@
%setup -q -n %{module}-%{version}
%build
-python setup.py build_ext
+%{__python} setup.py build_ext
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{py_sitescriptdir},%{_examplesdir}/%{name}-%{version}}
-python setup.py install \
+%{__python} setup.py install \
--root=$RPM_BUILD_ROOT \
--optimize=2
@@ -98,6 +98,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.16 2010/12/03 18:21:03 qboosh
+- updated to 1.5.5
+
Revision 1.15 2010/07/08 08:34:07 arekm
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pyparsing/python-pyparsing.spec?r1=1.15r2=1.16f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: python-pyparsing: pyparsing-1.5.5.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/pyparsing/pyparsing-1.5.5.tar.gz 0beba391cba3082d7914c289bffa52ce pyparsing-1.5.5.tar.gz Size: 1412611 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wpa_supplicant/wpa_supplicant.spec, wpa_supplicant/wpa_supplicant...
Author: bluesDate: Fri Dec 3 18:27:49 2010 GMT
Module: packages Tag: HEAD
Log message:
- TODO item
Files affected:
packages/wpa_supplicant:
wpa_supplicant.spec (1.75 - 1.76) , wpa_supplicant-syslog-support.patch
(NONE - 1.1) (NEW)
Diffs:
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.75
packages/wpa_supplicant/wpa_supplicant.spec:1.76
--- packages/wpa_supplicant/wpa_supplicant.spec:1.75Mon Nov 8 20:18:54 2010
+++ packages/wpa_supplicant/wpa_supplicant.spec Fri Dec 3 19:27:43 2010
@@ -1,10 +1,10 @@
# $Revision$, $Date$
# TODO:
-# - wpa_gui can be built with qt4 - bcond?
# - icon for wpa_gui
# - reverse madwifi bcond when appropriate packages will be available on ftp
# / as of madwifi-ng r1499 and kernel 2.6.14 wext driver could be
# used instead of madwifi - so madwifi bcond will become obsolete soon /
+# - syslog-support patch should be fixed and/or ripped from debian/ubuntu
#
# Conditional build
%bcond_without dbus# don't build D-BUS control interface
@@ -31,6 +31,7 @@
Patch0:%{name}-makefile.patch
Patch1:%{name}-OPTCFLAGS.patch
Patch2:%{name}-lrelease.patch
+Patch3:%{name}-syslog-support.patch
URL: http://hostap.epitest.fi/wpa_supplicant/
%{?with_dbus:BuildRequires:dbus-devel}
BuildRequires: libnl-devel
@@ -108,6 +109,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p0
+#patch3 -p0
install %{SOURCE1} wpa_supplicant/.config
@@ -198,6 +200,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.76 2010/12/03 18:27:43 blues
+- TODO item
+
Revision 1.75 2010/11/08 19:18:54 shadzik
- rel 2
Index: packages/wpa_supplicant/wpa_supplicant-syslog-support.patch
diff -u /dev/null
packages/wpa_supplicant/wpa_supplicant-syslog-support.patch:1.1
--- /dev/null Fri Dec 3 19:27:49 2010
+++ packages/wpa_supplicant/wpa_supplicant-syslog-support.patch Fri Dec 3
19:27:43 2010
@@ -0,0 +1,143 @@
+Index: wpa_supplicant/main.c
+===
+RCS file: /cvs/hostap/wpa_supplicant/main.c,v
+retrieving revision 1.14
+diff -u -r1.14 main.c
+--- wpa_supplicant/main.c 3 Dec 2005 18:33:07 - 1.14
wpa_supplicant/main.c 12 Feb 2006 00:54:28 -
+@@ -33,13 +33,12 @@
+
+ extern struct wpa_driver_ops *wpa_supplicant_drivers[];
+
+-
+ static void usage(void)
+ {
+ int i;
+ printf(%s\n\n%s\n
+ usage:\n
+- wpa_supplicant [-BddehLqqvwW] [-Ppid file]
++ wpa_supplicant [-BddehlLqqsvwW] [-Ppid file]
+ [-gglobal ctrl] \\\n
+ -iifname -cconfig file [-Cctrl] [-Ddriver]
+ [-pdriver_param] \\\n
+@@ -67,10 +66,12 @@
+-K = include keys (passwords, etc.) in debug output\n
+-t = include timestamp in debug messages\n
+-h = show this help text\n
++ -l = log file\n
+-L = show license (GPL and BSD)\n);
+ printf( -p = driver parameters\n
+-P = PID file\n
+-q = decrease debugging verbosity (-qq even less)\n
++ -s = log to syslog\n
+-v = show version\n
+-w = wait for interface to be added, if needed\n
+-W = wait for a control interface monitor before starting\n
+@@ -139,7 +140,7 @@
+ wpa_supplicant_fd_workaround();
+
+ for (;;) {
+- c = getopt(argc, argv, Bc:C:D:dg:hi:KLNp:P:qtvwW);
++ c = getopt(argc, argv, Bc:C:D:dg:hi:Kl:LNp:P:qstvwW);
+ if (c 0)
+ break;
+ switch (c) {
+@@ -177,6 +178,16 @@
+ case 'K':
+ params.wpa_debug_show_keys++;
+ break;
++ case 'l':
++#ifdef CONFIG_NO_STDOUT_DEBUG
++ printf(Logging disabled with
++ CONFIG_NO_STDOUT_DEBUG=y build time
++ option.\n);
++ return -1;
++#else /* CONFIG_NO_STDOUT_DEBUG */
++ params.log_file = os_rel2abs_path(optarg);
++ break;
++#endif /* CONFIG_NO_STDOUT_DEBUG */
+ case 'L':
+ license();
+ return -1;
+@@ -189,6 +200,16 @@
+ case 'q':
+ params.wpa_debug_level++;
+ break;
++ case 's':
++#ifdef CONFIG_NO_STDOUT_DEBUG
++ printf(Logging disabled with
++ CONFIG_NO_STDOUT_DEBUG=y build time
++ option.\n);
++ return
packages: python-pycurl/python-pycurl.spec - it is dual-licensed (LGPL/MIT-...
Author: qboosh Date: Fri Dec 3 18:41:03 2010 GMT
Module: packages Tag: HEAD
Log message:
- it is dual-licensed (LGPL/MIT-like)
Files affected:
packages/python-pycurl:
python-pycurl.spec (1.61 - 1.62)
Diffs:
Index: packages/python-pycurl/python-pycurl.spec
diff -u packages/python-pycurl/python-pycurl.spec:1.61
packages/python-pycurl/python-pycurl.spec:1.62
--- packages/python-pycurl/python-pycurl.spec:1.61 Sat Nov 13 01:20:31 2010
+++ packages/python-pycurl/python-pycurl.spec Fri Dec 3 19:40:58 2010
@@ -15,7 +15,7 @@
Name: python-%{module}
Version: 7.19.0
Release: 7
-License: LGPL
+License: LGPL v2 or MIT-like
Group: Libraries/Python
Source0:
http://pycurl.sourceforge.net/download/%{module}-%{version}.tar.gz
# Source0-md5: 919d58fe37e69fe87ce4534d8b6a1c7b
@@ -91,22 +91,22 @@
%py_postclean
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-rm -rf $RPM_BUILD_ROOT%{_docdir}/pycurl
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pycurl
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README ChangeLog TODO
-%attr(755,root,root) %{py_sitedir}/*.so
+%doc COPYING2 ChangeLog README TODO
+%attr(755,root,root) %{py_sitedir}/pycurl.so
%dir %{py_sitedir}/curl
%{py_sitedir}/curl/*.py[co]
%{py_sitedir}/pycurl-*.egg-info
%files doc
%defattr(644,root,root,755)
-%doc doc/*
+%doc doc/*.html
%files examples
%defattr(644,root,root,755)
@@ -118,6 +118,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.62 2010/12/03 18:40:58 qboosh
+- it is dual-licensed (LGPL/MIT-like)
+
Revision 1.61 2010/11/13 00:20:31 pawelz
- release 7
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pycurl/python-pycurl.spec?r1=1.61r2=1.62f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: openssl: openssl-1.0.0c.tar.gz
Files fetched: 1 STORED: ftp://ftp.openssl.org/source/openssl-1.0.0c.tar.gz ff8fb85610aef328315a9decbb2712e4 openssl-1.0.0c.tar.gz Size: 4023056 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: openssl/openssl.spec, openssl/openssl-tls.patch (REMOVED) - up to...
Author: arekmDate: Fri Dec 3 18:45:30 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.0.0c (fixes CVE-2010-4180, CVE-2010-4252, corrects fix for
CVE-2010-3864)
Files affected:
packages/openssl:
openssl.spec (1.230 - 1.231) , openssl-tls.patch (1.1 - NONE) (REMOVED)
Diffs:
Index: packages/openssl/openssl.spec
diff -u packages/openssl/openssl.spec:1.230 packages/openssl/openssl.spec:1.231
--- packages/openssl/openssl.spec:1.230 Fri Nov 19 11:55:26 2010
+++ packages/openssl/openssl.spec Fri Dec 3 19:45:25 2010
@@ -17,12 +17,12 @@
Summary(ru.UTF-8): Библиотеки и утилиты для соединений через Secure
Sockets Layer
Summary(uk.UTF-8): Бібліотеки та утиліти для з'єднань через Secure Sockets
Layer
Name: openssl
-Version: 1.0.0b
+Version: 1.0.0c
Release: 1
License: Apache-like
Group: Libraries
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 104deb3b7e6820cae6de3f49ba0ff2b0
+# Source0-md5: ff8fb85610aef328315a9decbb2712e4
Source2: %{name}.1.pl
Source3: %{name}-ssl-certificate.sh
Source4: %{name}-c_rehash.sh
@@ -34,7 +34,6 @@
Patch5:%{name}-asflag.patch
Patch6:%{name}-ca-certificates.patch
Patch7:%{name}-ldflags.patch
-Patch8:%{name}-tls.patch
URL: http://www.openssl.org/
BuildRequires: bc
BuildRequires: perl-devel = 1:5.6.1
@@ -246,7 +245,6 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
`grep -l -r %{_prefix}/local/bin/perl *`
@@ -517,6 +515,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.231 2010/12/03 18:45:25 arekm
+- up to 1.0.0c (fixes CVE-2010-4180, CVE-2010-4252, corrects fix for
CVE-2010-3864)
+
Revision 1.230 2010/11/19 10:55:26 hawk
- added CVE reference in last changelog entry
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.230r2=1.231f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: python-urlgrabber/python-urlgrabber.spec - use rm macro
Author: qboosh Date: Fri Dec 3 18:49:50 2010 GMT
Module: packages Tag: HEAD
Log message:
- use rm macro
Files affected:
packages/python-urlgrabber:
python-urlgrabber.spec (1.21 - 1.22)
Diffs:
Index: packages/python-urlgrabber/python-urlgrabber.spec
diff -u packages/python-urlgrabber/python-urlgrabber.spec:1.21
packages/python-urlgrabber/python-urlgrabber.spec:1.22
--- packages/python-urlgrabber/python-urlgrabber.spec:1.21 Sat Nov 13
01:21:32 2010
+++ packages/python-urlgrabber/python-urlgrabber.spec Fri Dec 3 19:49:45 2010
@@ -45,7 +45,7 @@
%{__python} setup.py install \
--root=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_docdir}/urlgrabber-%{version}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/urlgrabber-%{version}
%py_postclean
%clean
@@ -56,7 +56,7 @@
%doc ChangeLog README TODO
%attr(755,root,root) %{_bindir}/urlgrabber
%{py_sitescriptdir}/urlgrabber
-%{py_sitescriptdir}/*.egg-info
+%{py_sitescriptdir}/urlgrabber-*.egg-info
%define date%(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
@@ -64,6 +64,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.22 2010/12/03 18:49:45 qboosh
+- use rm macro
+
Revision 1.21 2010/11/13 00:21:32 pawelz
- release 5
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-urlgrabber/python-urlgrabber.spec?r1=1.21r2=1.22f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apertium-dict-fr-es/apertium-dict-fr-es.spec - removed bogus Rs (...
Author: qboosh Date: Fri Dec 3 18:56:38 2010 GMT
Module: packages Tag: HEAD
Log message:
- removed bogus Rs (c/p)
Files affected:
packages/apertium-dict-fr-es:
apertium-dict-fr-es.spec (1.2 - 1.3)
Diffs:
Index: packages/apertium-dict-fr-es/apertium-dict-fr-es.spec
diff -u packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.2
packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.3
--- packages/apertium-dict-fr-es/apertium-dict-fr-es.spec:1.2 Fri Dec 3
18:16:04 2010
+++ packages/apertium-dict-fr-es/apertium-dict-fr-es.spec Fri Dec 3
19:56:33 2010
@@ -18,8 +18,6 @@
BuildRequires: lttoolbox = 3.2.0
BuildRequires: pkgconfig
Requires: apertium = 3.2.0
-Requires: libxml2 = 1:2.6.17
-Requires: pcre-cxx = 6.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -73,6 +71,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.3 2010/12/03 18:56:33 qboosh
+- removed bogus Rs (c/p)
+
Revision 1.2 2010/12/03 17:16:04 qboosh
- proper desc
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apertium-dict-fr-es/apertium-dict-fr-es.spec?r1=1.2r2=1.3f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: mercurial/mercurial.spec - up to 1.7.2
Author: arekmDate: Fri Dec 3 19:04:33 2010 GMT
Module: packages Tag: HEAD
Log message:
- up to 1.7.2
Files affected:
packages/mercurial:
mercurial.spec (1.55 - 1.56)
Diffs:
Index: packages/mercurial/mercurial.spec
diff -u packages/mercurial/mercurial.spec:1.55
packages/mercurial/mercurial.spec:1.56
--- packages/mercurial/mercurial.spec:1.55 Thu Jul 8 14:11:02 2010
+++ packages/mercurial/mercurial.spec Fri Dec 3 20:04:24 2010
@@ -11,14 +11,15 @@
Summary: Mercurial Distributed SCM
Summary(pl.UTF-8): Mercurial - rozproszony SCM
Name: mercurial
-Version: 1.6
+Version: 1.7.2
Release: 1
License: GPL v2
Group: Development/Version Control
Source0:
http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-# Source0-md5: e97772cb424d29d9382c41daafa6f92d
+# Source0-md5: e9e99a0a20ded8f6d9463ffb94021b12
Source1: gtools.py
Patch0:%{name}-gtools.patch
+Patch1:%{name}-doc.patch
URL: http://www.selenic.com/mercurial/
BuildRequires: asciidoc
BuildRequires: gettext-devel
@@ -89,14 +90,13 @@
%prep
%setup -q
#%patch0 -p1
+%patch1 -p1
install %{SOURCE1} hgext/gtools.py
%build
%{__python} setup.py build
%{__make} -C doc
-rm tests/test-hgweb
-
%{?with_tests:cd tests %{__python} run-tests.py --verbose}
%install
@@ -138,6 +138,7 @@
%lang(it) %{py_sitedir}/%{name}/locale/it
%lang(ja) %{py_sitedir}/%{name}/locale/ja
%lang(pt_BR) %{py_sitedir}/%{name}/locale/pt_BR
+%lang(ro) %{py_sitedir}/%{name}/locale/ro
%lang(sv) %{py_sitedir}/%{name}/locale/sv
%lang(zh_CN) %{py_sitedir}/%{name}/locale/zh_CN
%lang(zh_TW) %{py_sitedir}/%{name}/locale/zh_TW
@@ -157,6 +158,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.56 2010/12/03 19:04:24 arekm
+- up to 1.7.2
+
Revision 1.55 2010/07/08 12:11:02 arekm
- up to 1.6
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mercurial/mercurial.spec?r1=1.55r2=1.56f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: mercurial/mercurial-doc.patch (NEW) - up to 1.7.2
Author: arekmDate: Fri Dec 3 19:04:40 2010 GMT Module: packages Tag: HEAD Log message: - up to 1.7.2 Files affected: packages/mercurial: mercurial-doc.patch (NONE - 1.1) (NEW) Diffs: Index: packages/mercurial/mercurial-doc.patch diff -u /dev/null packages/mercurial/mercurial-doc.patch:1.1 --- /dev/null Fri Dec 3 20:04:40 2010 +++ packages/mercurial/mercurial-doc.patch Fri Dec 3 20:04:32 2010 @@ -0,0 +1,10 @@ +--- mercurial-1.7.2/mercurial/demandimport.py~ 2010-12-02 01:46:11.0 +0100 mercurial-1.7.2/mercurial/demandimport.py 2010-12-03 19:56:17.506154254 +0100 +@@ -134,6 +134,7 @@ + # raise ImportError if x not defined + '__main__', + '_ssl', # conditional imports in the stdlib, issue1964 ++'gobject._gobject', + ] + + def enable(): ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mercurial: mercurial-1.7.2.tar.gz
Files fetched: 1 STORED: http://www.selenic.com/mercurial/release/mercurial-1.7.2.tar.gz e9e99a0a20ded8f6d9463ffb94021b12 mercurial-1.7.2.tar.gz Size: 2477283 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: python-feedparser/python-feedparser.spec - use py_postclean macro...
Author: qboosh Date: Fri Dec 3 19:10:36 2010 GMT
Module: packages Tag: HEAD
Log message:
- use py_postclean macro, more verbose files
Files affected:
packages/python-feedparser:
python-feedparser.spec (1.12 - 1.13)
Diffs:
Index: packages/python-feedparser/python-feedparser.spec
diff -u packages/python-feedparser/python-feedparser.spec:1.12
packages/python-feedparser/python-feedparser.spec:1.13
--- packages/python-feedparser/python-feedparser.spec:1.12 Sat Nov 13
01:19:03 2010
+++ packages/python-feedparser/python-feedparser.spec Fri Dec 3 20:10:30 2010
@@ -6,11 +6,12 @@
Release: 5
License: Python Software Foundation License
Group: Libraries/Python
-Source0: http://dl.sourceforge.net/feedparser/feedparser-%{version}.zip
+Source0:
http://downloads.sourceforge.net/feedparser/feedparser-%{version}.zip
# Source0-md5: 7ab1140c1e29d4cd52ab20fa7b1f8640
URL: http://feedparser.org/
BuildRequires: python-devel = 1:2.3.0
BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) = 1.219
BuildRequires: unzip
%pyrequires_eq python-modules
BuildArch: noarch
@@ -38,7 +39,7 @@
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-find $RPM_BUILD_ROOT%{py_sitescriptdir} -name *.py | xargs rm
+%py_postclean
%clean
rm -rf $RPM_BUILD_ROOT
@@ -46,7 +47,8 @@
%files
%defattr(644,root,root,755)
%doc README
-%{py_sitescriptdir}/*
+%{py_sitescriptdir}/feedparser.py[co]
+%{py_sitescriptdir}/feedparser-*.egg-info
%define date %(echo `LC_ALL=C date +%a %b %d %Y`)
%changelog
@@ -54,6 +56,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.13 2010/12/03 19:10:30 qboosh
+- use py_postclean macro, more verbose files
+
Revision 1.12 2010/11/13 00:19:03 pawelz
- release 5
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-feedparser/python-feedparser.spec?r1=1.12r2=1.13f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: VirtualBox-bin/VirtualBox-bin.spec - updated to 3.2.12
Author: adamgDate: Fri Dec 3 20:54:48 2010 GMT
Module: packages Tag: HEAD
Log message:
- updated to 3.2.12
Files affected:
packages/VirtualBox-bin:
VirtualBox-bin.spec (1.45 - 1.46)
Diffs:
Index: packages/VirtualBox-bin/VirtualBox-bin.spec
diff -u packages/VirtualBox-bin/VirtualBox-bin.spec:1.45
packages/VirtualBox-bin/VirtualBox-bin.spec:1.46
--- packages/VirtualBox-bin/VirtualBox-bin.spec:1.45Sat Oct 16 10:17:42 2010
+++ packages/VirtualBox-bin/VirtualBox-bin.spec Fri Dec 3 21:54:43 2010
@@ -17,23 +17,23 @@
%definerel 1
%definepname VirtualBox
-%defineprev66523
+%defineprev68302
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}-bin
-Version: 3.2.10
+Version: 3.2.12
Release: %{rel}
License: Free for non-commercial use, non-distributable
Group: Applications/Emulators
Source0:
http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_amd64.run
-# NoSource0-md5: 4f6303fe7680bd70f49bc96a770c2bf4
+# NoSource0-md5: 408db0aff4ada9664b8cdf156916ec64
NoSource: 0
Source1:
http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}-%{prev}-Linux_x86.run
-# NoSource1-md5: a72291e91d521f879338559954ac8b08
+# NoSource1-md5: 984b2dea108ba151ee5203f95987463c
NoSource: 1
Source2:
http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-# Source2-md5: 370bb3e893acffa584536c8f9e966c79
+# Source2-md5: d7f8685fe5fd84757b33d46e6f0b6bc5
Source3: %{pname}-vboxdrv.init
Source4: %{pname}-vboxadd.init
Source5: %{pname}-vboxnetadp.init
@@ -542,6 +542,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.46 2010/12/03 20:54:43 adamg
+- updated to 3.2.12
+
Revision 1.45 2010/10/16 08:17:42 pluto
- keep sources for both archs instead of racing in NoSourece-md5 update.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox-bin/VirtualBox-bin.spec?r1=1.45r2=1.46f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nethack/nethack-makefile.patch - fixed compilation and linking
Author: sls Date: Fri Dec 3 20:58:25 2010 GMT Module: packages Tag: HEAD Log message: - fixed compilation and linking Files affected: packages/nethack: nethack-makefile.patch (1.7 - 1.8) Diffs: Index: packages/nethack/nethack-makefile.patch diff -u packages/nethack/nethack-makefile.patch:1.7 packages/nethack/nethack-makefile.patch:1.8 --- packages/nethack/nethack-makefile.patch:1.7 Wed Nov 10 23:24:31 2004 +++ packages/nethack/nethack-makefile.patch Fri Dec 3 21:58:20 2010 @@ -6,7 +6,7 @@ # NetHack is standard C. If using Qt, uncomment the LD line here to get # the C++ libraries linked in. -CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -+CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include/qt ++CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include/qt -D__CORRECT_ISO_CPP_STRINGS_H_PROTO CXX=g++ #LD=g++ @@ -16,7 +16,7 @@ # WINTTYLIB = -lcurses16 -# WINTTYLIB = -lncurses -WINTTYLIB = -ltermlib -+WINTTYLIB = -lncurses ++WINTTYLIB = -lncurses -ltinfo +# WINTTYLIB = -ltermlib # # libraries for X11 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nethack/nethack-makefile.patch?r1=1.7r2=1.8f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: nethack/nethack.spec - less parallel building - rel. 6
Author: sls Date: Fri Dec 3 21:18:47 2010 GMT
Module: packages Tag: HEAD
Log message:
- less parallel building
- rel. 6
Files affected:
packages/nethack:
nethack.spec (1.78 - 1.79)
Diffs:
Index: packages/nethack/nethack.spec
diff -u packages/nethack/nethack.spec:1.78 packages/nethack/nethack.spec:1.79
--- packages/nethack/nethack.spec:1.78 Tue Feb 27 10:17:26 2007
+++ packages/nethack/nethack.spec Fri Dec 3 22:18:42 2010
@@ -14,7 +14,7 @@
Summary(pt_BR.UTF-8): Jogo estilo rogue baseado no Dungeons and Dragons
Name: nethack
Version: 3.4.3
-Release: 5
+Release: 6
License: Nethack GPL
Group: Applications/Games
Source0:
http://dl.sourceforge.net/nethack/%{name}-%{file_version}-src.tgz
@@ -130,7 +130,7 @@
%build
sh ./sys/unix/setup.sh links
-%{__make} all \
+%{__make} -j1 all \
CFLAGS=%{rpmcflags} -I../include -I/usr/include/ncurses
-DWIZARD='\%{_wizard}\' \
LFLAGS=%{rpmldflags} \
CC=%{__cc} \
@@ -204,6 +204,10 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.79 2010/12/03 21:18:42 sls
+- less parallel building
+- rel. 6
+
Revision 1.78 2007/02/27 09:17:26 qrczak
- XFree86 - X.org
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nethack/nethack.spec?r1=1.78r2=1.79f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: usb-modeswitch: usb-modeswitch-1.1.5.tar.bz2
Files fetched: 1 STORED: http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.5.tar.bz2 23a44bc67b9ca4b6f3fdaf4bf3618df9 usb-modeswitch-1.1.5.tar.bz2 Size: 39670 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: usb-modeswitch/usb-modeswitch.spec - ver. 1.1.5
Author: sls Date: Fri Dec 3 21:19:44 2010 GMT
Module: packages Tag: HEAD
Log message:
- ver. 1.1.5
Files affected:
packages/usb-modeswitch:
usb-modeswitch.spec (1.5 - 1.6)
Diffs:
Index: packages/usb-modeswitch/usb-modeswitch.spec
diff -u packages/usb-modeswitch/usb-modeswitch.spec:1.5
packages/usb-modeswitch/usb-modeswitch.spec:1.6
--- packages/usb-modeswitch/usb-modeswitch.spec:1.5 Wed Oct 13 22:09:14 2010
+++ packages/usb-modeswitch/usb-modeswitch.spec Fri Dec 3 22:19:39 2010
@@ -2,12 +2,12 @@
# TODO: Check if passing $(CPPFLAGS) to gcc is OK as done in patch0 ?
Summary: Switching tool for controlling flip flop USB devices
Name: usb-modeswitch
-Version: 1.1.4
+Version: 1.1.5
Release: 1
License: GPL v2
Group: Applications
Source0:
http://www.draisberghof.de/usb_modeswitch/%{name}-%{version}.tar.bz2
-# Source0-md5: a04db36bd0fc6fb303df7567f677b714
+# Source0-md5: 23a44bc67b9ca4b6f3fdaf4bf3618df9
Patch0:%{name}-makefile.patch
URL: http://www.draisberghof.de/usb_modeswitch/
BuildRequires: libusb-compat-devel
@@ -61,6 +61,9 @@
All persons listed below can be reached at cvs_login@pld-linux.org
$Log$
+Revision 1.6 2010/12/03 21:19:39 sls
+- ver. 1.1.5
+
Revision 1.5 2010/10/13 20:09:14 matkor
- Version 1.1.4-1.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/usb-modeswitch/usb-modeswitch.spec?r1=1.5r2=1.6f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet: Plugin.pm Processor.pm
Author: sparky
Date: Fri Dec 3 22:21:39 2010
New Revision: 11941
Modified:
toys/rsget.pl/RSGet/Plugin.pm
toys/rsget.pl/RSGet/Processor.pm
Log:
- add line information to generated plugins - finally some meaningful warnings
Modified: toys/rsget.pl/RSGet/Plugin.pm
==
--- toys/rsget.pl/RSGet/Plugin.pm (original)
+++ toys/rsget.pl/RSGet/Plugin.pm Fri Dec 3 22:21:39 2010
@@ -31,8 +31,10 @@
);
my $parts = join |, keys %parts;
+ my $line = 0;
my $part;
while ( F_IN ) {
+ $line++;
chomp;
next if /^\s*#/;
next if /^\s*$/;
@@ -58,6 +60,7 @@
}
while ( F_IN ) {
+ $line++;
chomp;
next if /^\s*#/;
next if /^\s*$/;
@@ -65,13 +68,12 @@
if ( /^($parts)\s*:/ ) {
$part = $1;
if ( $part eq perl ) {
- my @perl = F_IN;
- $parts{perl} = \...@perl;
+ push @{ $parts{perl} }, ( qq(#line $line
$self-{file} [perl]), F_IN );
}
next;
}
- push @{ $parts{ $part } }, $_;
+ push @{ $parts{ $part } }, ( qq(#line $line $self-{file}
[$part]), $_ );
}
close F_IN;
Modified: toys/rsget.pl/RSGet/Processor.pm
==
--- toys/rsget.pl/RSGet/Processor.pm(original)
+++ toys/rsget.pl/RSGet/Processor.pmFri Dec 3 22:21:39 2010
@@ -78,6 +78,7 @@
my $unify_body = ( join \n, @{ $parts-{unify} } ) || 's/#.*//;
s{/$}{};';
+ pr qq(#line 1 $opts-{pkg} preamble\n);
pr package $opts-{pkg};\n\n;
pr 'EOF';
use strict;
@@ -100,6 +101,11 @@
p_sub( stage0 );
my @machine = @{ $parts-{start} };
while ( $_ = shift @machine ) {
+ if ( /^#line/ ) {
+ pr $_ . \n;
+ next;
+ }
+
$space = ;
$space = $1 if s/^(\s+)//;
@@ -163,7 +169,7 @@
pr @{$parts-{perl}};
pr \npackage $opts-{pkg};\n;
- pr sub unify { local \$_ = shift; $unify_body;\nreturn \$_;\n};\n;
+ pr sub unify { local \$_ = shift;\n$unify_body;\nreturn \$_;\n};\n;
pr '\unify;';
my $unify = eval_it( $processed );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: usb-modeswitch-data: usb-modeswitch-data-20101202.tar.bz2
Files fetched: 1 STORED: http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20101202.tar.bz2 1263188609812752c68c2d6cfe2faf45 usb-modeswitch-data-20101202.tar.bz2 Size: 16714 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
