SOURCES: linux-2.6-sata-promise-pata-ports.patch (NEW) - patch for...
Author: zergin Date: Sat May 27 13:06:03 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch for 2.6 kernels to support PATA ports on Promise SATA contorllers
Files affected:
SOURCES:
linux-2.6-sata-promise-pata-ports.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/linux-2.6-sata-promise-pata-ports.patch
diff -u /dev/null SOURCES/linux-2.6-sata-promise-pata-ports.patch:1.1
--- /dev/null Sat May 27 15:06:03 2006
+++ SOURCES/linux-2.6-sata-promise-pata-ports.patch Sat May 27 15:05:58 2006
@@ -0,0 +1,128 @@
+diff -urN linux-2.6.16.16/drivers/scsi/libata-core.c
mod/drivers/scsi/libata-core.c
+--- linux-2.6.16.16/drivers/scsi/libata-core.c 2006-05-11 03:56:24.0
+0200
mod/drivers/scsi/libata-core.c 2006-05-20 03:14:57.165778500 +0200
+@@ -4431,6 +4431,7 @@
+ ap->mwdma_mask = ent->mwdma_mask;
+ ap->udma_mask = ent->udma_mask;
+ ap->flags |= ent->host_flags;
++ ap->flags |= ent->port_flags[port_no]; /* pata fix */
+ ap->ops = ent->port_ops;
+ ap->cbl = ATA_CBL_NONE;
+ ap->active_tag = ATA_TAG_POISON;
+diff -urN linux-2.6.16.16/drivers/scsi/sata_promise.c
mod/drivers/scsi/sata_promise.c
+--- linux-2.6.16.16/drivers/scsi/sata_promise.c2006-05-11
03:56:24.0 +0200
mod/drivers/scsi/sata_promise.c2006-05-20 03:29:36.708746500 +0200
+@@ -165,7 +165,7 @@
+ /* board_2037x */
+ {
+ .sht= &pdc_ata_sht,
+- .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA,
++ .host_flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */,
/* pata fix */
+ .pio_mask = 0x1f, /* pio0-4 */
+ .mwdma_mask = 0x07, /* mwdma0-2 */
+ .udma_mask = 0x7f, /* udma0-6 ; FIXME */
+@@ -322,15 +322,34 @@
+
+ static void pdc_sata_phy_reset(struct ata_port *ap)
+ {
+- pdc_reset_port(ap);
+- sata_phy_reset(ap);
++/*pdc_reset_port(ap); */ /* pata fix */
++/*sata_phy_reset(ap); */ /* pata fix */
++ /* if no sata flag, test for pata drive */ /* pata fix */
++ if (ap->flags & ATA_FLAG_SATA) /* pata fix */
++ { /* pata fix */
++ pdc_reset_port(ap); /* pata fix */
++ sata_phy_reset(ap); /* pata fix */
++ } /* pata fix */
++ else/* pata fix */
++ pdc_pata_phy_reset(ap); /* pata fix */
+ }
+
+ static void pdc_pata_phy_reset(struct ata_port *ap)
+ {
+ /* FIXME: add cable detect. Don't assume 40-pin cable */
+- ap->cbl = ATA_CBL_PATA40;
+- ap->udma_mask &= ATA_UDMA_MASK_40C;
++/*ap->cbl = ATA_CBL_PATA40; *//* pata fix */
++/*ap->udma_mask &= ATA_UDMA_MASK_40C; */ /* pata fix */
++ /* add cable detection code for pata drives */ /* pata fix */
++ u8 tmp; /* pata fix */
++ void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata
fix */
++ tmp = readb(mmio); /* pata fix */
++ if (tmp & 0x01) /* pata fix */
++ { /* pata fix */
++ ap->cbl = ATA_CBL_PATA40; /* pata fix */
++ ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */
++ } /* pata fix */
++ else/* pata fix */
++ ap->cbl = ATA_CBL_PATA80; /* pata fix */
+
+ pdc_reset_port(ap);
+ ata_port_probe(ap);
+@@ -646,6 +665,7 @@
+ unsigned int board_idx = (unsigned int) ent->driver_data;
+ int pci_dev_busy = 0;
+ int rc;
++ u8 tmp; /* pata fix */
+
+ if (!printed_version++)
+ dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+@@ -705,6 +725,9 @@
+ probe_ent->port[0].scr_addr = base + 0x400;
+ probe_ent->port[1].scr_addr = base + 0x500;
+
++ probe_ent->port_flags[0] = ATA_FLAG_SATA; /* pata fix */
++ probe_ent->port_flags[1] = ATA_FLAG_SATA; /* pata fix */
++
+ /* notice 4-port boards */
+ switch (board_idx) {
+ case board_20319:
+@@ -715,9 +738,25 @@
+
+ probe_ent->port[2].scr_addr = base + 0x600;
+ probe_ent->port[3].scr_addr = base + 0x700;
++
++ probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */
++ probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */
+ break;
+ case board_2037x:
+- probe_ent->
SPECS (LINUX_2_6): kernel.spec - added Patch1: PATA ports on Promi...
Author: zergin Date: Sat May 27 13:07:17 2006 GMT
Module: SPECS Tag: LINUX_2_6
Log message:
- added Patch1: PATA ports on Promise SATA controllers
builds, works, tested.
Files affected:
SPECS:
kernel.spec (1.441.2.1552 -> 1.441.2.1553)
Diffs:
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1552 SPECS/kernel.spec:1.441.2.1553
--- SPECS/kernel.spec:1.441.2.1552 Fri May 26 17:17:09 2006
+++ SPECS/kernel.spec Sat May 27 15:07:12 2006
@@ -157,6 +157,12 @@
# Patches
###
+#
+# PATA ports on SATA Promise controller; patch based on:
+#
http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch
+#
+Patch1:linux-2.6-sata-promise-pata-ports.patch
+
# tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
Patch2:tahoe9xx-2.6.11.5.patch
@@ -676,6 +682,8 @@
install %{SOURCE5} Makefile.ppclibs
%endif
+%patch1 -p1
+
for i in suspend2-%{suspend_version}-for-2.6.16.9/[0-9]*; do
patch -p1 -s < $i
done
@@ -1596,6 +1604,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.441.2.1553 2006/05/27 13:07:12 zergin
+- added Patch1: PATA ports on Promise SATA controllers
+ builds, works, tested.
+
Revision 1.441.2.1552 2006/05/26 15:17:09 baggins
- apply patch 102
CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1552&r2=1.441.2.1553&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pdns-2.9.20.tar.gz pdns.pdf
Files fetched: 2 STORED: http://downloads.powerdns.com/releases/pdns-2.9.20.tar.gz 33b20ef1b767f93297101f2aa09e99ed pdns-2.9.20.tar.gz Size: 867520 bytes STORED: http://downloads.powerdns.com/documentation/pdns.pdf 3ce3a16df5d91ceab75dea8307b35f2c pdns.pdf Size: 1174946 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
SPECS: pdns.spec - version up to 2.9.20 (rel 1) - STBR
Author: zergin Date: Sun Apr 9 22:30:48 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- version up to 2.9.20 (rel 1)
- STBR
Files affected:
SPECS:
pdns.spec (1.55 -> 1.56)
Diffs:
Index: SPECS/pdns.spec
diff -u SPECS/pdns.spec:1.55 SPECS/pdns.spec:1.56
--- SPECS/pdns.spec:1.55Mon Mar 27 14:41:36 2006
+++ SPECS/pdns.spec Mon Apr 10 00:30:43 2006
@@ -2,14 +2,14 @@
Summary: PowerDNS is a Versatile Database Driven Nameserver
Summary(pl): PowerDNS to wielofunkcyjny serwer nazw korzystający z
relacyjnych baz danych
Name: pdns
-Version: 2.9.19
-Release: 5
+Version: 2.9.20
+Release: 1
License: GPL
Group: Networking/Daemons
Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 30c96878b56845329cca5b8a351277b4
+# Source0-md5: 33b20ef1b767f93297101f2aa09e99ed
Source1: http://downloads.powerdns.com/documentation/%{name}.pdf
-# Source1-md5: f183b5bec39e40f8c55c19afc3a3f933
+# Source1-md5: 3ce3a16df5d91ceab75dea8307b35f2c
Source2: http://downloads.powerdns.com/documentation/%{name}.txt
Source3: %{name}.init
Source4: %{name}.conf
@@ -209,6 +209,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.56 2006/04/09 22:30:43 zergin
+- version up to 2.9.20 (rel 1)
+- STBR
+
Revision 1.55 2006/03/27 12:41:36 glen
- rel 5 (libmysqlclient_15)
CVS-web:
http://cvs.pld-linux.org/SPECS/pdns.spec?r1=1.55&r2=1.56&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: pdns-int16.patch - version up to 2.9.20 (rel 1) - STBR
Author: zergin Date: Sun Apr 9 22:30:49 2006 GMT
Module: SOURCES Tag: HEAD
Log message:
- version up to 2.9.20 (rel 1)
- STBR
Files affected:
SOURCES:
pdns-int16.patch (1.1 -> 1.2)
Diffs:
Index: SOURCES/pdns-int16.patch
diff -u SOURCES/pdns-int16.patch:1.1 SOURCES/pdns-int16.patch:1.2
--- SOURCES/pdns-int16.patch:1.1Thu Nov 17 19:10:52 2005
+++ SOURCES/pdns-int16.patchMon Apr 10 00:30:43 2006
@@ -1,7 +1,7 @@
-diff -Naur pdns-2.9.19-orig/modules/ldapbackend/ldapbackend.cc
pdns-2.9.19/modules/ldapbackend/ldapbackend.cc
pdns-2.9.19-orig/modules/ldapbackend/ldapbackend.cc2005-09-03
18:12:43.0 +
-+++ pdns-2.9.19/modules/ldapbackend/ldapbackend.cc 2005-11-16
17:22:33.0 +
-@@ -429,7 +429,7 @@
+diff -urN org/modules/ldapbackend/ldapbackend.cc
mod/modules/ldapbackend/ldapbackend.cc
+--- org/modules/ldapbackend/ldapbackend.cc 2006-03-15 19:29:39.0
+0100
mod/modules/ldapbackend/ldapbackend.cc 2006-04-08 02:07:50.117145250
+0200
+@@ -420,7 +420,7 @@
continue;
}
@@ -10,27 +10,27 @@
if( *endptr != '\0' )
{
L <<
Logger::Warning << m_myname << " Invalid " << attrname << " without priority
for " << m_qname << ": " << content << endl;
-diff -Naur pdns-2.9.19-orig/modules/ldapbackend/powerldap.cc
pdns-2.9.19/modules/ldapbackend/powerldap.cc
pdns-2.9.19-orig/modules/ldapbackend/powerldap.cc 2005-09-03
18:12:43.0 +
-+++ pdns-2.9.19/modules/ldapbackend/powerldap.cc 2005-11-16
17:22:59.0 +
+diff -urN org/modules/ldapbackend/powerldap.cc
mod/modules/ldapbackend/powerldap.cc
+--- org/modules/ldapbackend/powerldap.cc 2006-03-15 19:29:39.0
+0100
mod/modules/ldapbackend/powerldap.cc 2006-04-08 02:08:31.295718750
+0200
@@ -2,7 +2,7 @@
--PowerLDAP::PowerLDAP( const string& host, uint16_t port, bool tls )
-+PowerLDAP::PowerLDAP( const string& host, u_int16_t port, bool tls )
+-PowerLDAP::PowerLDAP( const string& hosts, uint16_t port, bool tls )
++PowerLDAP::PowerLDAP( const string& hosts, u_int16_t port, bool tls )
{
int protocol = LDAP_VERSION3;
-diff -Naur pdns-2.9.19-orig/modules/ldapbackend/powerldap.hh
pdns-2.9.19/modules/ldapbackend/powerldap.hh
pdns-2.9.19-orig/modules/ldapbackend/powerldap.hh 2005-09-03
18:12:43.0 +
-+++ pdns-2.9.19/modules/ldapbackend/powerldap.hh 2005-11-16
17:23:23.0 +
-@@ -69,7 +69,7 @@
+diff -urN org/modules/ldapbackend/powerldap.hh
mod/modules/ldapbackend/powerldap.hh
+--- org/modules/ldapbackend/powerldap.hh 2006-03-15 19:29:39.0
+0100
mod/modules/ldapbackend/powerldap.hh 2006-04-08 02:09:04.773811000
+0200
+@@ -79,7 +79,7 @@
typedef map > sentry_t;
typedef vector sresult_t;
-- PowerLDAP( const string& host = "127.0.0.1", uint16_t port = LDAP_PORT,
bool tls = false );
-+ PowerLDAP( const string& host = "127.0.0.1", u_int16_t port =
LDAP_PORT, bool tls = false );
+- PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, uint16_t port =
LDAP_PORT, bool tls = false );
++ PowerLDAP( const string& hosts = "ldap://127.0.0.1/";, u_int16_t port =
LDAP_PORT, bool tls = false );
~PowerLDAP();
void getOption( int option, int* value );
CVS-web:
http://cvs.pld-linux.org/SOURCES/pdns-int16.patch?r1=1.1&r2=1.2&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): kadu.spec - added missing BR: qt-linguist
Author: zergin Date: Sat Nov 12 15:58:45 2005 GMT
Module: SPECS Tag: DEVEL
Log message:
- added missing BR: qt-linguist
Files affected:
SPECS:
kadu.spec (1.97.2.60 -> 1.97.2.61)
Diffs:
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.60 SPECS/kadu.spec:1.97.2.61
--- SPECS/kadu.spec:1.97.2.60 Sat Oct 22 00:10:55 2005
+++ SPECS/kadu.spec Sat Nov 12 16:58:39 2005
@@ -71,6 +71,7 @@
BuildRequires: libtool
%{?with_nas:BuildRequires: nas-devel}
BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: qt-linguist
BuildRequires: sed >= 4.0
%{?with_tcl_scripting:BuildRequires: tk-devel >= 8.4}
%{?with_xmms:BuildRequires:xmms-devel}
@@ -627,6 +628,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.97.2.61 2005/11/12 15:58:39 zergin
+- added missing BR: qt-linguist
+
Revision 1.97.2.60 2005/10/21 22:10:55 jack
- updated to 20051021 snap
- updated weather_mod to 2.07
CVS-web:
http://cvs.pld-linux.org/SPECS/kadu.spec?r1=1.97.2.60&r2=1.97.2.61&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - added missing BR: libwrap-devel
Author: zergin Date: Sat Nov 19 23:25:25 2005 GMT
Module: SPECS Tag: DEVEL
Log message:
- added missing BR: libwrap-devel
Files affected:
SPECS:
php.spec (1.467.2.21 -> 1.467.2.22)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.467.2.21 SPECS/php.spec:1.467.2.22
--- SPECS/php.spec:1.467.2.21 Sat Oct 29 15:51:44 2005
+++ SPECS/php.spec Sun Nov 20 00:25:20 2005
@@ -163,6 +163,7 @@
BuildRequires: libpng-devel >= 1.0.8
BuildRequires: libtiff-devel
BuildRequires: libtool >= 1.4.3
+BuildRequires: libwrap-devel
BuildRequires: libxml2-devel >= 2.5.10
BuildRequires: libxslt-devel >= 1.0.18
%{?with_mhash:BuildRequires: mhash-devel}
@@ -3041,6 +3042,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.467.2.22 2005/11/19 23:25:20 zergin
+- added missing BR: libwrap-devel
+
Revision 1.467.2.21 2005/10/29 13:51:44 arekm
- merge from HEAD
CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.467.2.21&r2=1.467.2.22&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xdebug-2.0.0beta4.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/xdebug-2.0.0beta4.tgz 02655beb2fd80abd9c2246a4a9c6e30f xdebug-2.0.0beta4.tgz Size: 228343 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
SPECS: php-pecl-xdebug.spec - rel up: beta3 -> beta4 (works wit...
Author: zergin Date: Sun Nov 20 21:48:05 2005 GMT
Module: SPECS Tag: HEAD
Log message:
- rel up: beta3 -> beta4
(works with php 5.1 & is sopposed to work with 6.0 cvs)
Files affected:
SPECS:
php-pecl-xdebug.spec (1.31 -> 1.32)
Diffs:
Index: SPECS/php-pecl-xdebug.spec
diff -u SPECS/php-pecl-xdebug.spec:1.31 SPECS/php-pecl-xdebug.spec:1.32
--- SPECS/php-pecl-xdebug.spec:1.31 Sun Oct 30 14:29:16 2005
+++ SPECS/php-pecl-xdebug.spec Sun Nov 20 22:48:00 2005
@@ -7,13 +7,13 @@
Summary(pl): %{_modname} - funkcje do śledzenia i profilowania funkcji
Name: php-pecl-%{_modname}
Version: 2.0.0
-%define_snap beta3
-%define_rel5
+%define_snap beta4
+%define_rel1
Release: 0.%{_snap}.%{_rel}
License: BSD style
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}%{_snap}.tgz
-# Source0-md5: 05a688515e37f93552333f7f3e95402f
+# Source0-md5: 02655beb2fd80abd9c2246a4a9c6e30f
URL: http://pecl.php.net/package/xdebug/
BuildRequires: libedit-devel
BuildRequires: libtool
@@ -68,6 +68,7 @@
%prep
%setup -q -c
+chmod +x %{_modname}-%{version}%{_snap}/debugclient/configure
%build
cd %{_modname}-%{version}%{_snap}
@@ -120,6 +121,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.32 2005/11/20 21:48:00 zergin
+- rel up: beta3 -> beta4
+ (works with php 5.1 & is sopposed to work with 6.0 cvs)
+
Revision 1.31 2005/10/30 13:29:16 glen
- rel 0.beta3.5
CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-xdebug.spec?r1=1.31&r2=1.32&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kadu-20061025.tar.bz2 xmms-1.30.tar.gz amarok-1.18.tar.gz spellchecker-0.19.tar.gz weather-3.01.tar.bz2 tcl_scripting-0.6.2-Josephine.tar.gz kadu-spy-0.0.8-2.tar.gz led_notify-0.9.tar.bz2 m
Files fetched: 5 STORED: http://kadu.net/download/snapshots/2006/kadu-20061025.tar.bz2 21a55d099699d967028e49f4d8307a99 kadu-20061025.tar.bz2 Size: 1316751 bytes ALREADY GOT: http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.30.tar.gz 422b0bfe2fe1d67620896576e3092ac8 xmms-1.30.tar.gz STORED: http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.18.tar.gz 0ec8466884d98d63a6d2e4eeac814612 amarok-1.18.tar.gz Size: 10024 bytes STORED: http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.19.tar.gz f1e1c572f9fd92dfb420e62818bc826c spellchecker-0.19.tar.gz Size: 9383 bytes STORED: http://www.kadu.net/~blysk/weather-3.01.tar.bz2 c21727575d4bab551adeb9b5b1787f0c weather-3.01.tar.bz2 Size: 47490 bytes ALREADY GOT: http://scripts.one.pl/tcl4kadu/files/stable/0.4.3/tcl_scripting-0.6.2-Josephine.tar.gz 97406c1f3f34b8a073e0a1a18e842c9e tcl_scripting-0.6.2-Josephine.tar.gz ALREADY GOT: http://scripts.one.pl/~przemos/download/kadu-spy-0.0.8-2.tar.gz 2ffba6058d5d463ade20ff697e200f7c kadu-spy-0.0.8-2.tar.gz STORED: http://www.kadu.net/~blysk/led_notify-0.9.tar.bz2 3f9e347fd775324f4077f2f6849a0de7 led_notify-0.9.tar.bz2 Size: 3125 bytes ALREADY GOT: http://www.kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-1.3.2.tar.gz 76233b35fa769c56d7ff1343b1bf810f miastoplusa_sms-1.3.2.tar.gz ALREADY GOT: http://gov.one.pl/svnsnap/tabs-svn-rev46.tar.gz 0d313a489bad8bf8b324e347e74f00e6 tabs-svn-rev46.tar.gz -- 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
SPECS (DEVEL): kadu.spec - updated core to new snapshot (latest bu...
Author: zergin Date: Tue Oct 31 22:29:18 2006 GMT
Module: SPECS Tag: DEVEL
Log message:
- updated core to new snapshot (latest building)
- updated modules to latest snapshots
- added TODO
- reverted tcl_scripting/miasto_plusa bconds (can't get those to build)
- reverted spy bcond; consider dropping extension
- needs more extensive testing; works for me.
Files affected:
SPECS:
kadu.spec (1.97.2.65 -> 1.97.2.66)
Diffs:
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.65 SPECS/kadu.spec:1.97.2.66
--- SPECS/kadu.spec:1.97.2.65 Tue Sep 26 11:08:56 2006
+++ SPECS/kadu.spec Tue Oct 31 23:29:12 2006
@@ -1,55 +1,61 @@
# $Revision$, $Date$
#
+# TODO:
+# - make miasto_plusa/tcl_scripting compile again
+# - consider dropping spy module: doesn't work anymore as expected
+# (also website is down, download is down)
+#
# Conditional build:
-%bcond_without amarok # without amarok player support module
-%bcond_without alsa# without ALSA support
-%bcond_without arts# without arts sound server support
-%bcond_without esd # without ESD sound server support
-%bcond_without miasto_plusa# without miasto_plusa module support
-%bcond_without nas # without Network Audio System support
-%bcond_without speech # without Speech synthesis support
-%bcond_without spellchecker# without spellchecker (Aspell support)
-%bcond_without spy # without Spying module that shows who's
invisible
-%bcond_without tcl_scripting # without TCL scripting support and KaduPro
extensions
-%bcond_without weather # without weather check module support
-%bcond_without xmms# without xmms player support module
+%bcond_without amarok # without amarok player support module
+%bcond_without alsa# without ALSA support
+%bcond_without arts# without arts sound server support
+%bcond_without esd # without ESD sound server support
+%bcond_withmiasto_plusa# without miasto_plusa module support
+%bcond_without nas # without Network Audio System support
+%bcond_without speech # without Speech synthesis support
+%bcond_without spellchecker# without spellchecker (Aspell support)
+%bcond_withspy # without Spying module that shows who's
invisible
+%bcond_withtcl_scripting # without TCL scripting support and KaduPro
extensions
+%bcond_without weather # without weather check module support
+%bcond_without xmms# without xmms player support module
-%define_amarok_mod_ver 1.17
+%define_amarok_mod_ver 1.18
%define_libgadu_ver4:1.6
-%define_spellchecker_mod_ver 0.18
+%define_spellchecker_mod_ver 0.19
%define_spy_mod_ver0.0.8-2
%define_tcl_mod_ver0.6.2-Josephine
-%define_weather_ver3.0
+%define_weather_ver3.01
%define_xmms_mod_ver 1.30
-%define_led_ver0.7
+%define_led_ver0.9
%define_miasto_plusa_ver 1.3.2
%define_tabs_ver rev46
-%definesnapshot20060315
+%definesnapshot_major 2006
+%definesnapshot_minor 1025
#
Summary: A Gadu-Gadu client for online messaging
Summary(pl): Klient Gadu-Gadu do przesyłania wiadomości po sieci
Name: kadu
Version: 0.5.0
-Release: 0.%{snapshot}.1
+Release: 0.%{snapshot_major}%{snapshot_minor}.2
License: GPL v2
Group: Applications/Communications
-Source0: http://kadu.net/download/snapshots/%{name}-%{snapshot}.tar.bz2
-# Source0-md5: 74f8ae094de51a357dc9f5cb94051416
+Source0:
http://kadu.net/download/snapshots/%{snapshot_major}/%{name}-%{snapshot_major}%{snapshot_minor}.tar.bz2
+# Source0-md5: 21a55d099699d967028e49f4d8307a99
Source1: %{name}.desktop
Source2:
http://scripts.one.pl/xmms/devel/%{version}/xmms-%{_xmms_mod_ver}.tar.gz
# Source2-md5: 422b0bfe2fe1d67620896576e3092ac8
Source3:
http://scripts.one.pl/amarok/devel/%{version}/amarok-%{_amarok_mod_ver}.tar.gz
-# Source3-md5: 0fb5d8f465899ffbe96d44685e5e9955
+# Source3-md5: 0ec8466884d98d63a6d2e4eeac814612
Source4:
http://scripts.one.pl/spellchecker/devel/%{version}/spellchecker-%{_spellchecker_mod_ver}.tar.gz
-# Source4-md5: 6bf19f183eb4e5ea48e2a27d04da2ead
+# Source4-md5: f1e1c572f9fd92dfb420e62818bc826c
Source5: http://www.kadu.net/~blysk/weather-%{_weather_ver}.tar.bz2
-# Source5-md5: 01fc8dbdfe8431e30d8cd87387f5d56f
+# Source5-md5: c21727575d4bab551a
SPECS (DEVEL): kadu.spec - version 0.20061025.3 - fix missing dirs
Author: zergin Date: Wed Nov 1 13:18:56 2006 GMT
Module: SPECS Tag: DEVEL
Log message:
- version 0.20061025.3
- fix missing dirs
Files affected:
SPECS:
kadu.spec (1.97.2.66 -> 1.97.2.67)
Diffs:
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.66 SPECS/kadu.spec:1.97.2.67
--- SPECS/kadu.spec:1.97.2.66 Tue Oct 31 23:29:12 2006
+++ SPECS/kadu.spec Wed Nov 1 14:18:51 2006
@@ -36,7 +36,7 @@
Summary(pl): Klient Gadu-Gadu do przesyłania wiadomości po sieci
Name: kadu
Version: 0.5.0
-Release: 0.%{snapshot_major}%{snapshot_minor}.2
+Release: 0.%{snapshot_major}%{snapshot_minor}.3
License: GPL v2
Group: Applications/Communications
Source0:
http://kadu.net/download/snapshots/%{snapshot_major}/%{name}-%{snapshot_major}%{snapshot_minor}.tar.bz2
@@ -343,10 +343,10 @@
# force in mv stopped working
cp -fa $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
$RPM_BUILD_ROOT%{_libdir}/%{name}
rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data/tabs
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/config_wizard
$RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/config_wizard
-cp -fa $RPM_BUILD_ROOT%{_modules_dir}/data/tabs
$RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
+cp -Rfa $RPM_BUILD_ROOT%{_modules_dir}/data/tabs
$RPM_BUILD_ROOT%{_datadir}/%{name}/modules/data
rm -fr $RPM_BUILD_ROOT%{_modules_dir}/data/tabs
%if %{with xmms}
@@ -397,10 +397,15 @@
%if %{with miasto_plusa}
%{_datadir}/%{name}/modules/data/miastoplusa_sms/curl-ca-bundle.crt
%endif
+
+%dir %{_datadir}/%{name}/modules
+%dir %{_datadir}/%{name}/modules/data
+%dir %{_datadir}/%{name}/modules/data/tabs
%{_datadir}/%{name}/modules/data/tabs/attach.png
#default modules:
%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
%dir %{_modules_dir}
%{_modules_dir}/account_management.desc
%attr(755,root,root) %{_modules_dir}/account_management.so
@@ -592,6 +597,7 @@
%attr(755,root,root) %{_modules_dir}/amarok.so
%lang(pl) %{_modules_dir}/translations/amarok_pl.qm
%lang(de) %{_modules_dir}/translations/amarok_de.qm
+%dir %{_datadir}/%{name}/modules/data/amarok
%{_datadir}/%{name}/modules/data/amarok/amarok.png
%endif
@@ -601,6 +607,7 @@
%{_modules_dir}/spellchecker.desc
%attr(755,root,root) %{_modules_dir}/spellchecker.so
%lang(pl) %{_modules_dir}/translations/spellchecker_pl.qm
+%dir %{_datadir}/%{name}/modules/data/spellchecker
%{_datadir}/%{name}/modules/data/spellchecker/config.png
%endif
@@ -609,6 +616,7 @@
%defattr(644,root,root,755)
%{_modules_dir}/weather.desc
%attr(755,root,root) %{_modules_dir}/weather.so
+%dir %{_datadir}/%{name}/modules/data/weather
%{_datadir}/%{name}/modules/data/weather
%lang(pl) %{_modules_dir}/translations/weather_pl.qm
%endif
@@ -626,6 +634,7 @@
%if %{with spy}
%files module-spy
%defattr(644,root,root,755)
+%dir %{_datadir}/%{name}/modules/data/spy
%{_datadir}/%{name}/modules/data/spy/spy32.png
%{_modules_dir}/spy.desc
%attr(755,root,root) %{_modules_dir}/spy.so
@@ -639,6 +648,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.97.2.67 2006/11/01 13:18:51 zergin
+- version 0.20061025.3
+- fix missing dirs
+
Revision 1.97.2.66 2006/10/31 22:29:12 zergin
- updated core to new snapshot (latest building)
- updated modules to latest snapshots
CVS-web:
http://cvs.pld-linux.org/SPECS/kadu.spec?r1=1.97.2.66&r2=1.97.2.67&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: mysql-bug-24747.patch (NEW) - fix for bug#24747
Author: zergin Date: Sat Feb 3 17:38:58 2007 GMT
Module: SOURCES Tag: HEAD
Log message:
- fix for bug#24747
Files affected:
SOURCES:
mysql-bug-24747.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/mysql-bug-24747.patch
diff -u /dev/null SOURCES/mysql-bug-24747.patch:1.1
--- /dev/null Sat Feb 3 18:38:58 2007
+++ SOURCES/mysql-bug-24747.patch Sat Feb 3 18:38:52 2007
@@ -0,0 +1,139 @@
+diff -urN org/sql/item_xmlfunc.cc mod/sql/item_xmlfunc.cc
+--- org/sql/item_xmlfunc.cc2006-12-06 18:05:25.0 +0100
mod/sql/item_xmlfunc.cc2007-02-03 16:58:35.02758 +0100
+@@ -1047,12 +1047,12 @@
+ {MY_XPATH_LEX_OR , "or" , 2, 0 },
+ {MY_XPATH_LEX_DIV , "div", 3, 0 },
+ {MY_XPATH_LEX_MOD , "mod", 3, 0 },
+-
+- {MY_XPATH_LEX_NODETYPE, "comment", 7, 0 },
+- {MY_XPATH_LEX_NODETYPE, "text" , 4, 0 },
+- {MY_XPATH_LEX_NODETYPE, "processing-instruction" , 22,0 },
+- {MY_XPATH_LEX_NODETYPE, "node" , 4, 0 },
+-
++
++ {0,NULL,0,0}
++};
++
++static struct my_xpath_keyword_names_st my_axis_names[]=
++{
+ {MY_XPATH_LEX_AXIS,"ancestor" , 8,MY_XPATH_AXIS_ANCESTOR
},
+ {MY_XPATH_LEX_AXIS,"ancestor-or-self" ,16,MY_XPATH_AXIS_ANCESTOR_OR_SELF
},
+ {MY_XPATH_LEX_AXIS,"attribute" , 9,MY_XPATH_AXIS_ATTRIBUTE
},
+@@ -1070,6 +1070,16 @@
+ {0,NULL,0,0}
+ };
+
++static struct my_xpath_keyword_names_st my_nodetype_names[]=
++{
++ {MY_XPATH_LEX_NODETYPE, "comment", 7, 0 },
++ {MY_XPATH_LEX_NODETYPE, "text" , 4, 0 },
++ {MY_XPATH_LEX_NODETYPE, "processing-instruction" , 22,0 },
++ {MY_XPATH_LEX_NODETYPE, "node" , 4, 0 },
++
++ {0,NULL,0,0}
++};
++
+
+ /*
+ Lookup a keyword
+@@ -1081,11 +1091,15 @@
+ - Token type, on lookup success.
+ - MY_XPATH_LEX_IDENT, on lookup failure.
+ */
+-static int my_xpath_keyword(MY_XPATH *x, const char *beg, const char *end)
++static int my_xpath_keyword(
++ MY_XPATH *x,
++ struct my_xpath_keyword_names_st *keyword_names,
++ const char *beg,
++ const char *end)
+ {
+ struct my_xpath_keyword_names_st *k;
+ size_t length= end-beg;
+- for (k= my_keyword_names; k->name; k++)
++ for (k= keyword_names; k->name; k++)
+ {
+ if (length == k->length && !strncasecmp(beg, k->name, length))
+ {
+@@ -1378,8 +1392,32 @@
+ return;
+ }
+
++if(beg < end )
++{
++ if (*beg == '(')
++ {
++/*
++ check if a function call, e.g.: count(/a/b)
++ or a nodetype test, e.g.: /a/b/text()
++*/
++ if ((xpath->func= my_xpath_function(lex->beg, beg)))
++ lex->term= MY_XPATH_LEX_FUNC;
++else
++ lex->term= my_xpath_keyword(xpath, my_nodetype_names,
++ lex->beg, beg);
++return;
++ }
++ // check if an axis specifier, e.g.: /a/b/child::*
++ else if (*beg == ':' && beg + 1 < end && beg[1] == ':')
++ {
++lex->term= my_xpath_keyword(xpath, my_axis_names,
++lex->beg, beg);
++return;
++ }
++}
++
+ // check if a keyword
+-lex->term= my_xpath_keyword(xpath, lex->beg, beg);
++lex->term= my_xpath_keyword(xpath, my_keyword_names, lex->beg, beg);
+ return;
+ }
+
+@@ -2332,6 +2370,32 @@
+ return 1;
+ }
+
++ /*
++ * Scan NCName.
++ *
++ * SYNOPSYS
++ *
++ *The keywords AND, OR, MOD, DIV are valid identitiers
++ *when they are in identifier context:
++ *
++ *SELECT
ExtractValue('VALUE','/and/or/mod/div')
++ *-> VALUE
++ *
++ * RETURN
++ *1 - success
++ *0 - failure
++ *
++ */
++
++static int my_xpath_parse_NCName(MY_XPATH *xpath)
++{
++ return
++my_xpath_parse_term(xpath, MY_XPATH_LEX_IDENT) ||
++my_xpath_parse_term(xpath, MY_XPATH_LEX_AND) ||
++my_xpath_parse_term(xpath, MY_XPATH_LEX_OR)||
++my_xpath_parse_term(xpath, MY_XPATH_LEX_MOD) ||
++my_xpath_parse_term(xpath, MY_XPATH_LEX_DIV) ? 1 : 0;
++}
+
+ /*
+ QName grammar can be found in a separate document
+@@ -2345,12 +2409,12 @@
+ my_xpath_parse_QName(MY_XPATH *xpath)
+ {
+ const char *beg;
+- if (!my_xpath_parse_term(xpath, MY_XPATH_LEX_IDENT))
++ if (!my_xpath_parse_NCName(xpath))
+ return 0;
+ beg=
SPECS: mysql.spec - added fix for bug #24747 (from: http://lists.m...
Author: zergin Date: Sat Feb 3 17:47:38 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- added fix for bug #24747 (from: http://lists.mysql.com/commits/17414)
- added missing BR:doxygen (faild build on docs)
- builds & works w/o errors on Th x86_64
- rel: 2 => 3, STBR
Files affected:
SPECS:
mysql.spec (1.359 -> 1.360)
Diffs:
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.359 SPECS/mysql.spec:1.360
--- SPECS/mysql.spec:1.359 Fri Dec 22 16:46:52 2006
+++ SPECS/mysql.specSat Feb 3 18:47:33 2007
@@ -26,7 +26,7 @@
Summary(zh_CN):MySQLĘýžÝżâˇţÎńĆ÷
Name: mysql
Version: 5.1.14
-Release: 2
+Release: 3
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
Source0:
http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
@@ -61,9 +61,11 @@
Patch13: %{name}-bug-16634.patch
Patch14: %{name}-bug-18156.patch
Patch15: %{name}-bug-22807.patch
+Patch16: %{name}-bug-24747.patch
URL:
http://www.mysql.com/products/database/mysql/community_edition.html
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: doxygen
BuildRequires: libstdc++-devel >= 5:3.0
BuildRequires: libtool
%{?with_tcpd:BuildRequires:libwrap-devel}
@@ -462,6 +464,7 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
%build
%{__libtoolize}
@@ -946,6 +949,12 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.360 2007/02/03 17:47:33 zergin
+- added fix for bug #24747 (from: http://lists.mysql.com/commits/17414)
+- added missing BR:doxygen (faild build on docs)
+- builds & works w/o errors on Th x86_64
+- rel: 2 => 3, STBR
+
Revision 1.359 2006/12/22 15:46:52 arekm
- rel 2; doc dropped
CVS-web:
http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.359&r2=1.360&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: ruby-xslt.spec (NEW) - Import: original SPEC by Piotr Biedr...
Author: zergin Date: Sun Apr 29 21:25:52 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- Import: original SPEC by Piotr Biedruna (p.biedruna at gmail dot com)
- Converted to UTF8
- Fixed missing BR: ruby-devel
Files affected:
SPECS:
ruby-xslt.spec (NONE -> 1.1) (NEW)
Diffs:
Index: SPECS/ruby-xslt.spec
diff -u /dev/null SPECS/ruby-xslt.spec:1.1
--- /dev/null Sun Apr 29 23:25:52 2007
+++ SPECS/ruby-xslt.specSun Apr 29 23:25:46 2007
@@ -0,0 +1,73 @@
+# $Revision$, $Date$
+Summary: Ruby xslt bindings
+Summary(pl.UTF-8): Dowiązania xslt dla ruby`ego
+Name: ruby-xslt
+Version: 0.9.3
+Release: 1
+License: GPL
+Group: Development/Languages
+Source0: http://gregoire.lejeune.free.fr/%{name}_%{version}.tar.gz
+# Source0-md5: f69bf3a70bedbd44f7dee25df20546fd
+
+BuildRequires: libgcrypt-devel >= 1.2.4
+BuildRequires: libgpg-error-devel >= 1.4-2
+BuildRequires: libxml2-devel >= 2.6.27
+BuildRequires: libxslt-devel >= 1.1.19
+BuildRequires: rpmbuild(macros) >= 1.277
+BuildRequires: ruby-devel
+BuildRequires: zlib-devel >= 1.2.3
+
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+xslt bingings for ruby
+
+%description -l pl.UTF-8
+dowiązania xslt dla ruby`ego
+
+%prep
+%setup -q -n %{name}
+
+%build
+ruby extconf.rb
+%{__make}
+%{__make} doc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{ruby_rubylibdir}/xml
+cp -af lib/xslt.rb $RPM_BUILD_ROOT%{ruby_rubylibdir}/xml
+
+install -d $RPM_BUILD_ROOT%{ruby_archdir}/xml
+cp -af xslt_lib.so $RPM_BUILD_ROOT%{ruby_archdir}/xml
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc doc/*
+%attr(755,root,root) %{ruby_rubylibdir}/xml*
+%dir %{ruby_rubylibdir}/xml
+%attr(755,root,root) %{ruby_archdir}/xml/*.so
+%dir %{ruby_archdir}/xml
+
+%post
+echo
"\n"
+echo " ruby-xslt documentation in: %{_docdir}/%{name}-%{version}/index.html"
+echo
"\n"
+
+
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[EMAIL PROTECTED]>
+All persons listed below can be reached at @pld-linux.org
+
+$Log$
+Revision 1.1 2007/04/29 21:25:46 zergin
+- Import: original SPEC by Piotr Biedruna (p.biedruna at gmail dot com)
+- Converted to UTF8
+- Fixed missing BR: ruby-devel
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ruby-xslt_0.9.3.tar.gz
Files fetched: 1 STORED: http://gregoire.lejeune.free.fr/ruby-xslt_0.9.3.tar.gz f69bf3a70bedbd44f7dee25df20546fd ruby-xslt_0.9.3.tar.gz Size: 55613 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
SPECS: ruby-xslt.spec - use %banner macro
Author: zergin Date: Mon Apr 30 09:13:50 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- use %banner macro
Files affected:
SPECS:
ruby-xslt.spec (1.1 -> 1.2)
Diffs:
Index: SPECS/ruby-xslt.spec
diff -u SPECS/ruby-xslt.spec:1.1 SPECS/ruby-xslt.spec:1.2
--- SPECS/ruby-xslt.spec:1.1Sun Apr 29 23:25:46 2007
+++ SPECS/ruby-xslt.specMon Apr 30 11:13:45 2007
@@ -54,10 +54,11 @@
%dir %{ruby_archdir}/xml
%post
-echo
"\n"
-echo " ruby-xslt documentation in: %{_docdir}/%{name}-%{version}/index.html"
-echo
"\n"
-
+%banner %{name}-%{version} << EOF
+
+* ruby-xslt documentation in: %{_docdir}/%{name}-%{version}/index.html
*
+
+EOF
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -66,6 +67,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.2 2007/04/30 09:13:45 zergin
+- use %banner macro
+
Revision 1.1 2007/04/29 21:25:46 zergin
- Import: original SPEC by Piotr Biedruna (p.biedruna at gmail dot com)
- Converted to UTF8
CVS-web:
http://cvs.pld-linux.org/SPECS/ruby-xslt.spec?r1=1.1&r2=1.2&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: ruby-xslt.spec - patch by Piotr Biedruna p.biedruna at gmai...
Author: zergin Date: Mon Apr 30 11:22:53 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- patch by Piotr Biedruna p.biedruna at gmail dot com
- remove %banner (no need to tell where the docs are, thnx qboosh)
- have more verbose description
Files affected:
SPECS:
ruby-xslt.spec (1.2 -> 1.3)
Diffs:
Index: SPECS/ruby-xslt.spec
diff -u SPECS/ruby-xslt.spec:1.2 SPECS/ruby-xslt.spec:1.3
--- SPECS/ruby-xslt.spec:1.2Mon Apr 30 11:13:45 2007
+++ SPECS/ruby-xslt.specMon Apr 30 13:22:48 2007
@@ -20,10 +20,10 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-xslt bingings for ruby
+Ruby-xslt is a simple XSLT class based on libxml (xmlsoft.org) and libxslt
(xmlsoft.org/XSLT).
%description -l pl.UTF-8
-dowiązania xslt dla ruby`ego
+Prosta klasa transformacji XSL oparta na libxml (xmlsoft.org) oraz libxslt
(xmlsoft.org/XSLT).
%prep
%setup -q -n %{name}
@@ -53,20 +53,17 @@
%attr(755,root,root) %{ruby_archdir}/xml/*.so
%dir %{ruby_archdir}/xml
-%post
-%banner %{name}-%{version} << EOF
-
-* ruby-xslt documentation in: %{_docdir}/%{name}-%{version}/index.html
*
-
-EOF
-
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.3 2007/04/30 11:22:48 zergin
+- patch by Piotr Biedruna p.biedruna at gmail dot com
+ - remove %banner (no need to tell where the docs are, thnx qboosh)
+ - have more verbose description
+
Revision 1.2 2007/04/30 09:13:45 zergin
- use %banner macro
CVS-web:
http://cvs.pld-linux.org/SPECS/ruby-xslt.spec?r1=1.2&r2=1.3&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLDWWW: Vserver
Author: zergin Date: Sat Jul 21 19:12:49 2007 GMT
Module: PLDWWW URL: http://pld-linux.org/Vserver?action=diff&rev2=78&rev1=77
Log message:
Page affected: Vserver
Diffs:
# echo i686 >> /etc/vservers/test/uts/machine
}}}
+
+ === package built for different operating system (linux) ===
+
+ When setting up vservers on Th with recent poldek one might run into an error
with message:
+ {{{
+ błąd: name.arch: pakiet zbudowano dla innego systemu operacyjnego (linux)
+ }}}
+
+ it can be resolved by copying platform information from host system to
vservers default settings directory:
+ {{{
+ # cp /etc/rpm/platform /usr/lib/util-vserver/distributions/pld-th/rpm
+ # cp /etc/rpm/platform /usr/lib/util-vserver/distributions/pld-ac/rpm
+ }}}
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLDWWW: Vserver
Author: zergin Date: Sun Jul 22 23:35:09 2007 GMT
Module: PLDWWW URL: http://pld-linux.org/Vserver?action=diff&rev2=79&rev1=78
Log message:
Page affected: Vserver
Diffs:
When setting up vservers on Th with recent poldek one might run into an error
with message:
{{{
- błąd: name.arch: pakiet zbudowano dla innego systemu operacyjnego (linux)
+ error: package.arch: package is for a different operating system (linux)
}}}
it can be resolved by copying platform information from host system to
vservers default settings directory:
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xdebug-2.0.0RC1.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/xdebug-2.0.0RC1.tgz a048de3dbb5a16489921f2096b8003e1 xdebug-2.0.0RC1.tgz Size: 252286 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
SPECS: php-pecl-xdebug.spec - up to RC1 - works with PHP 5.2 - bui...
Author: zergin Date: Wed Dec 13 13:41:13 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- up to RC1
- works with PHP 5.2
- builds natively with gcc4 (patch dropped)
Files affected:
SPECS:
php-pecl-xdebug.spec (1.36 -> 1.37)
Diffs:
Index: SPECS/php-pecl-xdebug.spec
diff -u SPECS/php-pecl-xdebug.spec:1.36 SPECS/php-pecl-xdebug.spec:1.37
--- SPECS/php-pecl-xdebug.spec:1.36 Wed Mar 29 20:35:37 2006
+++ SPECS/php-pecl-xdebug.spec Wed Dec 13 14:41:08 2006
@@ -7,14 +7,13 @@
Summary(pl): %{_modname} - funkcje do śledzenia i profilowania funkcji
Name: php-pecl-%{_modname}
Version: 2.0.0
-%define_snap beta5
-%define_rel2
+%define_snap RC1
+%define_rel1
Release: 0.%{_snap}.%{_rel}
License: BSD style
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}%{_snap}.tgz
-# Source0-md5: 3aa38da6a75923bd9560c69b63faa37d
-Patch0:%{name}-gcc4.patch
+# Source0-md5: a048de3dbb5a16489921f2096b8003e1
URL: http://pecl.php.net/package/xdebug/
BuildRequires: libedit-devel
BuildRequires: libtool
@@ -69,7 +68,6 @@
%prep
%setup -q -c
-%patch0 -p0
chmod +x %{_modname}-%{version}%{_snap}/debugclient/configure
%build
@@ -123,6 +121,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.37 2006/12/13 13:41:08 zergin
+- up to RC1
+- works with PHP 5.2
+- builds natively with gcc4 (patch dropped)
+
Revision 1.36 2006/03/29 18:35:37 arekm
- rel .2
CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-xdebug.spec?r1=1.36&r2=1.37&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: php-pecl-xdebug-gcc4.patch (REMOVED) - no longer needed
Author: zergin Date: Wed Dec 13 13:41:58 2006 GMT Module: SOURCES Tag: HEAD Log message: - no longer needed Files affected: SOURCES: php-pecl-xdebug-gcc4.patch (1.1 -> NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: APC-3.0.12p2.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/APC-3.0.12p2.tgz e7f1762ee95cdaaf90cf16345c6228a3 APC-3.0.12p2.tgz Size: 94809 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
SPECS: php-pecl-APC.spec - up to 3.0.12p2 (works with PHP5.2, serv...
Author: zergin Date: Wed Dec 13 13:46:00 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 3.0.12p2 (works with PHP5.2, serveral crash fixes, etc)
- changed config dir of apache module to php/conf.d (no longer requires
apache1 though i'm not shure about this change)
Files affected:
SPECS:
php-pecl-APC.spec (1.22 -> 1.23)
Diffs:
Index: SPECS/php-pecl-APC.spec
diff -u SPECS/php-pecl-APC.spec:1.22 SPECS/php-pecl-APC.spec:1.23
--- SPECS/php-pecl-APC.spec:1.22Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-APC.spec Wed Dec 13 14:45:55 2006
@@ -12,12 +12,12 @@
Summary: %{_modname} - Alternative PHP Cache
Summary(pl): %{_modname} - alternatywne cache PHP
Name: php-pecl-%{_modname}
-Version: 3.0.11
-Release: 2
+Version: 3.0.12p2
+Release: 1
License: PHP
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz
-# Source0-md5: 4d4481ba7be4245320083b9b254d6d79
+# Source0-md5: e7f1762ee95cdaaf90cf16345c6228a3
URL: http://pecl.php.net/package/APC/
BuildRequires: php-devel >= 3:5.0.0
BuildRequires: rpmbuild(macros) >= 1.322
@@ -75,9 +75,9 @@
install -D %{_modname}-%{version}/modules/apc.so
$RPM_BUILD_ROOT%{extensionsdir}/%{_modname}.so
# we install APC.ini for all handlers but CLI and CGI
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,apache,apache2handler}.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,conf,apache2handler}.d
cp -a %{_modname}.ini $RPM_BUILD_ROOT%{_sysconfdir}/cgi-fcgi.d/%{_modname}.ini
-cp -a %{_modname}.ini $RPM_BUILD_ROOT%{_sysconfdir}/apache.d/%{_modname}.ini
+cp -a %{_modname}.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
cp -a %{_modname}.ini
$RPM_BUILD_ROOT%{_sysconfdir}/apache2handler.d/%{_modname}.ini
%clean
@@ -97,7 +97,7 @@
%defattr(644,root,root,755)
%doc %{_modname}-%{version}/{CHANGELOG,INSTALL,NOTICE}
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/cgi-fcgi.d/%{_modname}.ini
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.d/%{_modname}.ini
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/%{_modname}.ini
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache2handler.d/%{_modname}.ini
%attr(755,root,root) %{extensionsdir}/%{_modname}.so
@@ -107,6 +107,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.23 2006/12/13 13:45:55 zergin
+- up to 3.0.12p2 (works with PHP5.2, serveral crash fixes, etc)
+- changed config dir of apache module to php/conf.d (no longer requires
+ apache1 though i'm not shure about this change)
+
Revision 1.22 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-APC.spec?r1=1.22&r2=1.23&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): kadu.spec - fixed miasto_plusa bcond (would fail on...
Author: zergin Date: Tue Sep 26 09:09:01 2006 GMT
Module: SPECS Tag: DEVEL
Log message:
- fixed miasto_plusa bcond (would fail on packaging due to missing files)
Files affected:
SPECS:
kadu.spec (1.97.2.64 -> 1.97.2.65)
Diffs:
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.64 SPECS/kadu.spec:1.97.2.65
--- SPECS/kadu.spec:1.97.2.64 Thu Mar 16 01:51:58 2006
+++ SPECS/kadu.spec Tue Sep 26 11:08:56 2006
@@ -388,7 +388,9 @@
%{_datadir}/%{name}/ChangeLog
%{_datadir}/%{name}/COPYING
%{_datadir}/%{name}/THANKS
+%if %{with miasto_plusa}
%{_datadir}/%{name}/modules/data/miastoplusa_sms/curl-ca-bundle.crt
+%endif
%{_datadir}/%{name}/modules/data/tabs/attach.png
#default modules:
@@ -415,8 +417,10 @@
%attr(755,root,root) %{_modules_dir}/ext_sound.so
%{_modules_dir}/hints.desc
%attr(755,root,root) %{_modules_dir}/hints.so
+%if %{with miasto_plusa}
%{_modules_dir}/miastoplusa_sms.desc
%attr(755,root,root) %{_modules_dir}/miastoplusa_sms.so
+%endif
%{_modules_dir}/migration.desc
%attr(755,root,root) %{_modules_dir}/migration.so
%{_modules_dir}/*notify.desc
@@ -477,7 +481,9 @@
%lang(fr) %{_modules_dir}/translations/hints_fr.qm
%lang(it) %{_modules_dir}/translations/hints_it.qm
%lang(pl) %{_modules_dir}/translations/hints_pl.qm
+%if %{with miasto_plusa}
%lang(pl) %{_modules_dir}/translations/miastoplusa_sms_pl.qm
+%endif
%lang(de) %{_modules_dir}/translations/migration_de.qm
%lang(fr) %{_modules_dir}/translations/migration_fr.qm
%lang(it) %{_modules_dir}/translations/migration_it.qm
@@ -627,6 +633,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.97.2.65 2006/09/26 09:08:56 zergin
+- fixed miasto_plusa bcond (would fail on packaging due to missing files)
+
Revision 1.97.2.64 2006/03/16 00:51:58 jack
- updated to 20060315 snap
- updated to brand new weather_mod 3.0
CVS-web:
http://cvs.pld-linux.org/SPECS/kadu.spec?r1=1.97.2.64&r2=1.97.2.65&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: ndiswrapper.spec - fix x86_64 build (w/o CONFIG_x86_64 win2...
Author: zergin Date: Tue Sep 26 09:06:21 2006 GMT
Module: SPECS Tag: HEAD
Log message:
- fix x86_64 build (w/o CONFIG_x86_64 win2lin_stubs.h fails to build)
Files affected:
SPECS:
ndiswrapper.spec (1.64 -> 1.65)
Diffs:
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.64 SPECS/ndiswrapper.spec:1.65
--- SPECS/ndiswrapper.spec:1.64 Tue Sep 12 17:50:05 2006
+++ SPECS/ndiswrapper.spec Tue Sep 26 11:06:16 2006
@@ -120,7 +120,8 @@
%if %{with userspace}
%{__make} -C utils \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -Wall -DUTILS_VERSION=\\\"\$(UTILS_VERSION)\\\""
+ CFLAGS="%{rpmcflags} -Wall -DUTILS_VERSION=\\\"\$(UTILS_VERSION)\\\"" \
+ %{?x8664:CONFIG_X86_64=y}
%endif
%if %{with kernel}
@@ -142,10 +143,12 @@
M=$PWD O=$PWD/o \
KVERS="%{_kernel_ver}" \
%{?with_verbose:V=1}
+
%{__make} KBUILD=%{_kernelsrcdir} \
RCS_FIND_IGNORE="-name '*.ko' -o" \
M=$PWD O=$PWD/o \
KVERS="%{_kernel_ver}" \
+ %{?x8664:CONFIG_X86_64=y} \
%{?with_verbose:V=1}
mv ndiswrapper{,-$cfg}.ko
done
@@ -215,6 +218,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.65 2006/09/26 09:06:16 zergin
+- fix x86_64 build (w/o CONFIG_x86_64 win2lin_stubs.h fails to build)
+
Revision 1.64 2006/09/12 15:50:05 shadzik
- 1.24rc4
- fixed %setup after qboosh
CVS-web:
http://cvs.pld-linux.org/SPECS/ndiswrapper.spec?r1=1.64&r2=1.65&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: xdebug-2.0.0RC3.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/xdebug-2.0.0RC3.tgz 5cc4bd38b26074f91bbf3d0237b8d21e xdebug-2.0.0RC3.tgz Size: 261735 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
SPECS: php-pecl-xdebug.spec - up to RC3
Author: zergin Date: Sun Feb 25 13:47:12 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- up to RC3
Files affected:
SPECS:
php-pecl-xdebug.spec (1.42 -> 1.43)
Diffs:
Index: SPECS/php-pecl-xdebug.spec
diff -u SPECS/php-pecl-xdebug.spec:1.42 SPECS/php-pecl-xdebug.spec:1.43
--- SPECS/php-pecl-xdebug.spec:1.42 Tue Feb 13 09:06:40 2007
+++ SPECS/php-pecl-xdebug.spec Sun Feb 25 14:47:07 2007
@@ -7,13 +7,13 @@
Summary(pl.UTF-8): %{_modname} - funkcje do śledzenia i profilowania
funkcji
Name: php-pecl-%{_modname}
Version: 2.0.0
-%define_snap RC2
+%define_snap RC3
%define_rel1
Release: 1.%{_snap}.%{_rel}
License: BSD style
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}%{_snap}.tgz
-# Source0-md5: 2abef81227a5d60af45ad0792e2fd996
+# Source0-md5: 5cc4bd38b26074f91bbf3d0237b8d21e
URL: http://pecl.php.net/package/xdebug/
BuildRequires: libedit-devel
BuildRequires: libtool
@@ -119,6 +119,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.43 2007/02/25 13:47:07 zergin
+- up to RC3
+
Revision 1.42 2007/02/13 08:06:40 glen
- tabs in preamble
CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-xdebug.spec?r1=1.42&r2=1.43&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: php/php.spec, php/php-bug-50458.patch (NEW) - add patch for bug#5...
Author: zergin Date: Tue Dec 15 23:57:35 2009 GMT
Module: packages Tag: HEAD
Log message:
- add patch for bug#50458 (to be removed with 5.3.2)
- up rel 1.11 to 1.12
Files affected:
packages/php:
php.spec (1.830 -> 1.831) , php-bug-50458.patch (NONE -> 1.1) (NEW)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.830 packages/php/php.spec:1.831
--- packages/php/php.spec:1.830 Wed Dec 2 11:29:07 2009
+++ packages/php/php.spec Wed Dec 16 00:57:29 2009
@@ -106,7 +106,7 @@
%undefine with_filter
%endif
-%definerel 1.11
+%definerel 1.12
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -140,6 +140,8 @@
Patch8:%{name}-config-file-scan-dir.patch
Patch9:%{name}-sh.patch
Patch10: %{name}-ini.patch
+# untill 5.3.2 when this gets released
+Patch11: %{name}-bug-50458.patch
%if %{with type_hints}
Patch12: http://ilia.ws/patch/type_hint_53_v2.txt
%endif
@@ -1737,6 +1739,8 @@
%patch51 -p1
%patch52 -p1
+%patch11 -p4
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -2929,6 +2933,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.831 2009/12/15 23:57:29 zergin
+- add patch for bug#50458 (to be removed with 5.3.2)
+- up rel 1.11 to 1.12
+
Revision 1.830 2009/12/02 10:29:07 glen
- CLI borked
Index: packages/php/php-bug-50458.patch
diff -u /dev/null packages/php/php-bug-50458.patch:1.1
--- /dev/null Wed Dec 16 00:57:35 2009
+++ packages/php/php-bug-50458.patchWed Dec 16 00:57:30 2009
@@ -0,0 +1,115 @@
+--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c2009/12/11 22:30:46
292003
php/php-src/branches/PHP_5_3/ext/pdo/pdo_stmt.c2009/12/14 03:44:33
292107
+@@ -784,95 +784,20 @@
+
+ static int make_callable_ex(pdo_stmt_t *stmt, zval *callable, zend_fcall_info
* fci, zend_fcall_info_cache * fcc, int num_args TSRMLS_DC) /* {{{ */
+ {
+- zval *object = NULL, **method = NULL;
+- char *fname = NULL, *cname;
+- zend_class_entry * ce = NULL, **pce;
+- zend_function *function_handler;
+-
+- if (Z_TYPE_P(callable) == IS_ARRAY) {
+- if (Z_ARRVAL_P(callable)->nNumOfElements < 2) {
+- pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied function must be a valid callback" TSRMLS_CC);
+- return 0;
+- }
+- object = *(zval**)Z_ARRVAL_P(callable)->pListHead->pData;
+- method =
(zval**)Z_ARRVAL_P(callable)->pListHead->pListNext->pData;
++ char *is_callable_error = NULL;
+
+- if (Z_TYPE_P(object) == IS_STRING) { /* static call */
+- if (zend_lookup_class(Z_STRVAL_P(object),
Z_STRLEN_P(object), &pce TSRMLS_CC) == FAILURE) {
+- pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied class does not exist" TSRMLS_CC);
+- return 0;
+- } else {
+- ce = *pce;
+- }
+- object = NULL;
+- } else if (Z_TYPE_P(object) == IS_OBJECT) { /* object call */
+- ce = Z_OBJCE_P(object);
++ if (zend_fcall_info_init(callable, 0, fci, fcc, NULL,
&is_callable_error TSRMLS_CC) == FAILURE) {
++ if (is_callable_error) {
++ pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
is_callable_error TSRMLS_CC);
++ efree(is_callable_error);
+ } else {
+- pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied function must be a valid callback; bogus object/class name"
TSRMLS_CC);
+- return 0;
+- }
+-
+- if (Z_TYPE_PP(method) != IS_STRING) {
+- pdo_raise_impl_error(stmt->dbh, stmt, "HY000",
"user-supplied function must be a valid callback; bogus method name" TSRMLS_CC);
+- return 0;
+- }
+- } else if (Z_TYPE_P(callable) == IS_STRING) {
+- method = &callable;
+- }
+-
+- if (!method || !zend_is_callable(callable, 0, &fname TSRMLS_CC)) {
+- pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "user-supplied
function must be a valid callback" TSRMLS_CC);
+- if (fname) {
+-
SPECS (DEVEL): kde4-kdesdk.spec - bump version to 4.1.85
Author: zergin Date: Mon Dec 29 19:49:43 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- bump version to 4.1.85
Files affected:
SPECS:
kde4-kdesdk.spec (1.21.2.11 -> 1.21.2.12)
Diffs:
Index: SPECS/kde4-kdesdk.spec
diff -u SPECS/kde4-kdesdk.spec:1.21.2.11 SPECS/kde4-kdesdk.spec:1.21.2.12
--- SPECS/kde4-kdesdk.spec:1.21.2.11Mon Dec 15 00:03:21 2008
+++ SPECS/kde4-kdesdk.spec Mon Dec 29 20:49:37 2008
@@ -6,12 +6,12 @@
Summary: KDESDK - Software Development Kit for KDE
Summary(pl.UTF-8): KDESDK - Wsparcie programistyczne dla KDE
Name: kde4-kdesdk
-Version: 4.1.82
+Version: 4.1.85
Release: 1
License: GPL
Group: X11/Development/Tools
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: d07858c4ddfd6aa5eddacb1a521f961b
+# Source0-md5: 9fff92efdd5ca6f8b60f293a6830fe70
Patch0:%{name}-kiosvn.patch
URL: http://www.kde.org/
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -776,12 +776,9 @@
%files kapptemplate -f kapptemplate.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kapptemplate
-%dir %{_datadir}/apps/kapptemplate
%{_datadir}/config.kcfg/kapptemplate.kcfg
-%{_datadir}/apps/kapptemplate/[!b]*
%{_desktopdir}/kde4/kapptemplate.desktop
%dir %{_datadir}/apps/kdevappwizard
-%{_datadir}/apps/kdevappwizard/template_descriptions
%{_datadir}/apps/kdevappwizard/templates
%{_iconsdir}/*/*x*/apps/kapptemplate.*
@@ -1015,6 +1012,9 @@
* %{date} PLD Team
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.21.2.12 2008/12/29 19:49:37 zergin
+- bump version to 4.1.85
+
Revision 1.21.2.11 2008/12/14 23:03:21 cactus
- up to 4.1.82
- umbrello disabled because of boost problems
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdesdk.spec?r1=1.21.2.11&r2=1.21.2.12&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ERRORS: php5.3-200812271530.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz
wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/e3f2dc5a-36f1-4b9f-a655-417d7743958f/5af2615d3f9547157138a713cf7bab7c/php5.3-200812271530.tar.bz2 "http://snaps.php.net/php5.3-200812271530.tar.bz2": http://snaps.php.net/php5.3-200812271530.tar.bz2: 2008-12-29 20:52:32 ERROR 404: Not Found. FATAL: http://snaps.php.net/php5.3-200812271530.tar.bz2 (5af2615d3f9547157138a713cf7bab7c) was not fetched (wget -nv --no-check-certificate --user-agent=PLD/distfiles -O ./tmp/e3f2dc5a-36f1-4b9f-a655-417d7743958f/5af2615d3f9547157138a713cf7bab7c/php5.3-200812271530.tar.bz2 "http://snaps.php.net/php5.3-200812271530.tar.bz2": http://snaps.php.net/php5.3-200812271530.tar.bz2: 2008-12-29 20:52:32 ERROR 404: Not Found. ) Files fetched: 0 ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- 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
SPECS (DEVEL): php.spec - adapt to current snap - drop linkflags clean patc...
Author: zergin Date: Mon Dec 29 19:52:33 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- adapt to current snap
- drop linkflags clean patch (as on HEAD)
- obsolete mhash extension (dropped, replaced by hash)
- drop ming extension (moved to pecl)
- builds w/o sybase_ct
Files affected:
SPECS:
php.spec (1.688.2.18 -> 1.688.2.19)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.18 SPECS/php.spec:1.688.2.19
--- SPECS/php.spec:1.688.2.18 Sun Nov 9 02:36:51 2008
+++ SPECS/php.spec Mon Dec 29 20:52:27 2008
@@ -25,8 +25,6 @@
%bcond_without imap# without IMAP extension module
%bcond_without interbase # without InterBase extension module
%bcond_without ldap# without LDAP extension module
-%bcond_without mhash # without mhash extension module
-%bcond_without ming# without ming extension module
%bcond_without mm # without mm support for session storage
%bcond_without mssql # without MS SQL extension module
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
@@ -67,7 +65,7 @@
%endif
%define_rel0.18
-%define_snap 200811082130
+%define_snap 200812271530
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -81,7 +79,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: e4e977f880e3df1b3ff9c0d3210ab9b7
+# Source0-md5: 5af2615d3f9547157138a713cf7bab7c
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -117,7 +115,6 @@
Patch24: %{name}-builddir.patch
Patch25: %{name}-zlib-for-getimagesize.patch
Patch26: %{name}-versioning.patch
-Patch27: %{name}-linkflags-clean.patch
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
Patch38: %{name}-tds.patch
@@ -157,8 +154,6 @@
BuildRequires: libwrap-devel
BuildRequires: libxml2-devel >= 2.5.10
BuildRequires: libxslt-devel >= 1.1.0
-%{?with_mhash:BuildRequires: mhash-devel}
-%{?with_ming:BuildRequires:ming-devel >= 0.3}
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
BuildRequires: mysql-devel >= 4.0.0
%{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0}
@@ -375,6 +370,7 @@
Provides: php(zend_module_api) = %{zend_module_api}
Provides: php5(debug) = %{php_debug}
Provides: php5(thread-safety) = %{zend_zts}
+Obsoletes: php-mhash
Obsoletes: php-pcre < 4:5.2.0
Obsoletes: php-pecl-domxml
Obsoletes: php-pecl-fileinfo
@@ -785,36 +781,6 @@
%description mcrypt -l pl.UTF-8
Moduł PHP dodający możliwość szyfrowania poprzez bibliotekę mcrypt.
-%package mhash
-Summary: mhash extension module for PHP
-Summary(pl.UTF-8): Moduł mhash dla PHP
-Group: Libraries
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(mhash)
-
-%description mhash
-This is a dynamic shared object (DSO) for PHP that will add mhash
-support.
-
-%description mhash -l pl.UTF-8
-Moduł PHP udostępniający funkcje mieszające z biblioteki mhash.
-
-%package ming
-Summary: ming extension module for PHP
-Summary(pl.UTF-8): Moduł ming dla PHP
-Group: Libraries
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: ming >= 0.3
-Provides: php(ming)
-
-%description ming
-This is a dynamic shared object (DSO) for PHP that will add ming
-(Flash - .swf files) support.
-
-%description ming -l pl.UTF-8
-Moduł PHP dodający obsługę plików Flash (.swf) poprzez bibliotekę
-ming.
-
%package mssql
Summary: MS SQL extension module for PHP
Summary(pl.UTF-8): Moduł MS SQL dla PHP
@@ -1498,7 +1464,6 @@
%prep
%setup -q -n %{name}%{version}-%{_snap}
-%patch27 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -1700,8 +1665,6 @@
--with-jpeg-dir=/usr \
%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
--with-mcrypt=shared \
- %{?with_mhash:--with-mhash=shared} \
- %{?with_ming:--with-ming=shared} \
%{?with_mm:--with-mm} \
%{?with_mssql:--with-mssql=shared} \
--with-mysql=shared,/usr \
@@ -1977,8 +1940,6 @@
%extension_scripts ldap
%extension_scripts mbstring
%extension_scripts mcrypt
-%extension_scripts mhash
-%extension_scripts ming
%extension_scripts mssql
%extension_scripts mysql
%extension_scripts mysqli
@@ -2073,12 +2034,6 @@
%triggerun mcrypt -- %{name}-mcrypt < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mcrypt\.so/d'
%{_sysconfdir}/php.ini
-%triggerun mhash -- %{name}-mhash < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mhash\.so/d'
%
SOURCES (DEVEL): php-uint32_t.patch - adapt to new sources
Author: zergin Date: Mon Dec 29 20:11:52 2008 GMT Module: SOURCES Tag: DEVEL Log message: - adapt to new sources Files affected: SOURCES: php-uint32_t.patch (1.2 -> 1.2.4.1) Diffs: Index: SOURCES/php-uint32_t.patch diff -u SOURCES/php-uint32_t.patch:1.2 SOURCES/php-uint32_t.patch:1.2.4.1 --- SOURCES/php-uint32_t.patch:1.2 Sun Dec 26 16:35:19 2004 +++ SOURCES/php-uint32_t.patch Mon Dec 29 21:11:46 2008 @@ -1,12 +1,11 @@ -adds missing include in zend_strtod.c (caused build to fail on sparc) - php-5.0.3/Zend/zend_strtod.c~ 2004-12-14 09:41:35.0 +0100 -+++ php-5.0.3/Zend/zend_strtod.c 2004-12-21 08:45:10.050119856 +0100 -@@ -90,6 +90,7 @@ - */ +diff -ur php5.3-200812262130/Zend/zend_strtod.c mod/Zend/zend_strtod.c +--- php5.3-200812262130/Zend/zend_strtod.c 2008-12-02 18:36:12.0 +0100 mod/Zend/zend_strtod.c 2008-12-27 01:28:47.0 +0100 +@@ -93,6 +93,7 @@ + #include #include +#include + #include - #if defined(LIBC_SCCS) && !defined(lint) - static char *rcsid = "$OpenBSD: strtod.c,v 1.19 2004/02/03 16:52:11 drahn Exp $"; + #ifdef ZTS CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-uint32_t.patch?r1=1.2&r2=1.2.4.1&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (DEVEL): php-gd_imagerotate_enable.patch - adapt to new sources
Author: zergin Date: Mon Dec 29 20:16:31 2008 GMT
Module: SOURCES Tag: DEVEL
Log message:
- adapt to new sources
Files affected:
SOURCES:
php-gd_imagerotate_enable.patch (1.4 -> 1.4.2.1)
Diffs:
Index: SOURCES/php-gd_imagerotate_enable.patch
diff -u SOURCES/php-gd_imagerotate_enable.patch:1.4
SOURCES/php-gd_imagerotate_enable.patch:1.4.2.1
--- SOURCES/php-gd_imagerotate_enable.patch:1.4 Fri Dec 22 23:54:25 2006
+++ SOURCES/php-gd_imagerotate_enable.patch Mon Dec 29 21:16:24 2008
@@ -1,78 +1,172 @@
php-5.2.0/ext/gd/config.m4.orig2005-11-29 19:25:59.0 +0100
-+++ php-5.2.0/ext/gd/config.m4 2006-12-22 23:41:12.363074440 +0100
-@@ -261,6 +261,7 @@
- PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown,
[AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB
$GD_SHARED_LIBADD ])
+diff -ur php5.3-200812262130/ext/gd/config.m4 mod/ext/gd/config.m4
+--- php5.3-200812262130/ext/gd/config.m4 2008-07-18 04:34:20.0
+0200
mod/ext/gd/config.m4 2008-12-27 01:12:23.0 +0100
+@@ -255,6 +255,7 @@
PHP_CHECK_LIBRARY(gd, gdFreeFontCache,
[AC_DEFINE(HAVE_GD_FREEFONTCACHE,1, [ ])], [], [ -L$GD_LIB
$GD_SHARED_LIBADD ])
+ PHP_CHECK_LIBRARY(gd, gdFontCacheMutexSetup, [AC_DEFINE(HAVE_GD_FONTMUTEX,
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx,
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB
$GD_SHARED_LIBADD ])
+ PHP_CHECK_LIBRARY(gd, gdImageRotate, [AC_DEFINE(HAVE_GD_ROTATE,
1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
])
dnl
-@@ -313,6 +314,7 @@
- AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
+@@ -308,6 +309,7 @@
+ AC_DEFINE(HAVE_GD_FONTMUTEX,1, [ ])
AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])
AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])
+ AC_DEFINE(HAVE_GD_ROTATE, 1, [ ])
dnl Make sure the libgd/ is first in the include path
GDLIB_CFLAGS="-DHAVE_LIBPNG"
php-5.2.0/ext/gd/gd.c.orig 2006-10-18 18:04:37.0 +0200
-+++ php-5.2.0/ext/gd/gd.c 2006-12-22 23:45:04.600308887 +0100
-@@ -314,7 +314,7 @@
+diff -ur php5.3-200812262130/ext/gd/gd.c mod/ext/gd/gd.c
+--- php5.3-200812262130/ext/gd/gd.c2008-12-12 14:35:20.0 +0100
mod/ext/gd/gd.c2008-12-27 01:18:43.0 +0100
+@@ -296,7 +296,7 @@
ZEND_END_ARG_INFO()
#endif
-#ifdef HAVE_GD_BUNDLED
+#ifdef HAVE_GD_ROTATE
- static
ZEND_BEGIN_ARG_INFO_EX(arginfo_imagerotate, 0, 0, 3)
ZEND_ARG_INFO(0, im)
-@@ -1020,8 +1020,10 @@
- PHP_FE(imagecopyresampled,
arginfo_imagecopyresampled)
+ ZEND_ARG_INFO(0, angle)
+@@ -927,9 +927,12 @@
+ PHP_FE(imagegrabscreen,
arginfo_imagegrabscreen)
#endif
--#ifdef HAVE_GD_BUNDLED
+#ifdef HAVE_GD_ROTATE
- PHP_FE(imagerotate,
arginfo_imagerotate)
++ PHP_FE(imagerotate,
arginfo_imagerotate)
+#endif
-+#ifdef HAVE_GD_BUNDLED
- PHP_FE(imageantialias,
arginfo_imageantialias)
++
+ #ifdef HAVE_GD_BUNDLED
+- PHP_FE(imagerotate,
arginfo_imagerotate)
+- PHP_FE(imageantialias,
arginfo_imageantialias)
++ PHP_FE(imageantialias,
arginfo_imageantialias)
+ #endif
+
+ #if HAVE_GD_IMAGESETTILE
+@@ -1079,7 +1082,7 @@
+ PHP_INI_ENTRY("gd.jpeg_ignore_warning", "0", PHP_INI_ALL, NULL)
+ PHP_INI_END()
+ /* }}} */
+-
++
+ /* {{{ php_free_gd_image
+ */
+ static void php_free_gd_image(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+@@ -1140,7 +1143,7 @@
#endif
-@@ -1248,11 +1250,13 @@
+ REGISTER_INI_ENTRIES();
+-
++
+ REGISTER_LONG_CONSTANT("IMG_GIF", 1, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_JPG", 2, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("IMG_JPEG", 2, CONST_CS | CONST_PERSISTENT);
+@@ -1168,11 +1171,14 @@
#ifdef GD2_FMT_COMPRESSED
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED,
CONST_CS | CONST_PERSISTENT);
#endif
-#if HAVE_GD_BUNDLED
-+#ifdef HAVE_GD_ROTATE
++#if HAVE_GD_ROTATE
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(
DISTFILES: memcache-3.0.1.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/memcache-3.0.1.tgz 1c340c7ffcd10fcbee9f06c7158eded5 memcache-3.0.1.tgz Size: 42081 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
SPECS: php-pecl-memcache.spec - version up to 3.0.1 - add new conf...
Author: zergin Date: Wed Feb 13 15:54:12 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- version up to 3.0.1
- add new config options
Files affected:
SPECS:
php-pecl-memcache.spec (1.27 -> 1.28)
Diffs:
Index: SPECS/php-pecl-memcache.spec
diff -u SPECS/php-pecl-memcache.spec:1.27 SPECS/php-pecl-memcache.spec:1.28
--- SPECS/php-pecl-memcache.spec:1.27 Mon Nov 26 21:42:39 2007
+++ SPECS/php-pecl-memcache.specWed Feb 13 16:54:06 2008
@@ -4,12 +4,12 @@
Summary: %{_modname} - a memcached extension
Summary(pl.UTF-8): %{_modname} - rozszerzenie memcached
Name: php-pecl-%{_modname}
-Version: 3.0.0
+Version: 3.0.1
Release: 1
License: PHP 2.02
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz
-# Source0-md5: 0cc7d64f4af5b63403604c3cec308315
+# Source0-md5: 1c340c7ffcd10fcbee9f06c7158eded5
URL: http://pecl.php.net/package/memcache/
BuildRequires: php-devel >= 3:5.0.0
BuildRequires: rpmbuild(macros) >= 1.344
@@ -60,6 +60,11 @@
;memcache.allow_failover=1
;memcache.chunk_size=8192
;memcache.default_port=11211
+;memcache.protocol=ascii
+;memcache.redudndancy=1
+;memcache.session_redundancy=2
+;memcache.hash_strategy=consistent
+;memcache.hash_function=crc32
EOF
%clean
@@ -85,6 +90,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.28 2008-02-13 15:54:06 zergin
+- version up to 3.0.1
+- add new config options
+
Revision 1.27 2007-11-26 20:42:39 adamg
- updated to 3.0.0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pecl-memcache.spec?r1=1.27&r2=1.28&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - updated to work with current snaps - up to snap: ...
Author: zergin Date: Fri May 23 16:36:07 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- updated to work with current snaps
- up to snap: 200805231030
- added phar extension (now enabled by default)
- build in hash extension (can't get it to link properly when shared)
- commented out php_sapi_name() tests: it SEGVs in build root but works
after install (dunno); see http://bugs.php.net/bug.php?id=45079
- fixed building --without sqlite
- removed obsolete patch for bug #42952
- removed posibility to build w/o pcre (pcre must be available)
- works for me on x86_64 --without apache1 fcgi ming
Files affected:
SPECS:
php.spec (1.688.2.7 -> 1.688.2.8)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.7 SPECS/php.spec:1.688.2.8
--- SPECS/php.spec:1.688.2.7Sat Nov 10 15:52:04 2007
+++ SPECS/php.spec Fri May 23 18:36:02 2008
@@ -33,8 +33,9 @@
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
%bcond_without odbc# without ODBC extension module
%bcond_without openssl # without OpenSSL support and OpenSSL extension
(module)
-%bcond_without pcre# without PCRE extension module
+#%bcond_withoutpcre# without PCRE extension module
# pcre must be enabled
%bcond_without pgsql # without PostgreSQL extension module
+%bcond_without phar# without phar extension module
%bcond_without pspell # without pspell extension module
%bcond_without recode # without recode extension module
%bcond_without snmp# without SNMP extension module
@@ -74,7 +75,7 @@
%endif
%define_rel0.14
-%define_snap 200711090930
+%define_snap 200805231030
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -88,7 +89,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: a127a009001037cb2d2d3f1e7ebe9173
+# Source0-md5: dcd0e73852d4d322902f47f32593e223
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -127,9 +128,9 @@
Patch25: %{name}-zlib-for-getimagesize.patch
Patch26: %{name}-versioning.patch
Patch27: %{name}-linkflags-clean.patch
-Patch28: %{name}-pear.patch
+Patch28: %{name}-pear.patch
Patch29: %{name}-config-dir.patch
-Patch30: %{name}-bug-42952.patch
+#Patch30: %{name}-bug-42952.patch
Patch31: %{name}-fcgi-graceful.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
@@ -370,6 +371,7 @@
Requires: glibc >= 6:2.3.5
Requires: php-dirs
Provides: php(date)
+Provides: php(hash)
Provides: php(libxml)
Provides: php(modules_api) = %{php_api_version}
Provides: php(overload)
@@ -1144,6 +1146,20 @@
%description pgsql -l pt_BR.UTF-8
Um módulo para aplicações PHP que usam bancos de dados postgresql.
+%package phar
+Summary: phar database module for PHP
+Summary(pl.UTF-8): Moduł phar dla PHP
+Group: Libraries
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: php(phar)
+
+%description phar
+This is a dynamic shared object (DSO) for PHP that will add phar
+archive a support.
+
+%description phar -l pl.UTF-8
+Moduł PHP umożliwiający dostęp do achiwów .phar.
+
%package posix
Summary: POSIX extension module for PHP
Summary(pl.UTF-8): Moduł POSIX dla PHP
@@ -1564,7 +1580,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
-#%patch7 -p1 UPDATE
+%patch7 -p1 UPDATE
%patch8 -p1
%patch9 -p1
@@ -1590,9 +1606,10 @@
%patch25 -p1
%{?with_versioning:%patch26 -p1}
+# just for tabs?!
%patch28 -p1
%patch29 -p1
-%patch30 -p1
+%patch30 -p1
%patch31 -p1
# conflict seems to be resolved by recode patches
@@ -1639,6 +1656,7 @@
fi
export PROG_SENDMAIL="/usr/lib/sendmail"
export CPPFLAGS=-DDEBUG_FASTCGI
+export PATH="/usr/lib64/ccache:$PATH"
sapis="
%if %{with fcgi}
@@ -1659,7 +1677,7 @@
sapi_args=''
case $sapi in
cgi)
- sapi_args='--enable-discard-path --enable-force-cgi-redirect'
+ sapi_args=' --disable-fastcgi --enable-discard-path
--enable-force-cgi-redirect'
;;
cli)
sapi_args='--disable-cgi'
@@ -1676,7 +1694,7 @@
sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
;;
esac
-
+
%configure \
$sapi_args \
%if "%{!?configure_cache:0}%{?configure_cache}" == "0"
@@ -1684,7 +1702,7 @
DISTFILES: php5.3-200805231030.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200805231030.tar.bz2 dcd0e73852d4d322902f47f32593e223 php5.3-200805231030.tar.bz2 Size: 9825091 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- 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
SPECS (DEVEL): php.spec - adapterized - cleanup
Author: zergin Date: Fri May 23 17:01:29 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- adapterized
- cleanup
Files affected:
SPECS:
php.spec (1.688.2.8 -> 1.688.2.9)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.8 SPECS/php.spec:1.688.2.9
--- SPECS/php.spec:1.688.2.8Fri May 23 18:36:02 2008
+++ SPECS/php.spec Fri May 23 19:01:23 2008
@@ -33,7 +33,6 @@
%bcond_without mysqli # without mysqli support (Requires mysql > 4.1)
%bcond_without odbc# without ODBC extension module
%bcond_without openssl # without OpenSSL support and OpenSSL extension
(module)
-#%bcond_withoutpcre# without PCRE extension module
# pcre must be enabled
%bcond_without pgsql # without PostgreSQL extension module
%bcond_without phar# without phar extension module
%bcond_without pspell # without pspell extension module
@@ -66,7 +65,7 @@
%endif
%if %{without apache1} && %{without apache2}
-ERROR: You need to select at least one Apache SAPI to build shared modules.
+ERROR: You need to select at least one Apache SAPI to build shared
modules.
%endif
# filter depends on pcre
@@ -128,9 +127,8 @@
Patch25: %{name}-zlib-for-getimagesize.patch
Patch26: %{name}-versioning.patch
Patch27: %{name}-linkflags-clean.patch
-Patch28: %{name}-pear.patch
+Patch28: %{name}-pear.patch
Patch29: %{name}-config-dir.patch
-#Patch30: %{name}-bug-42952.patch
Patch31: %{name}-fcgi-graceful.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
@@ -239,43 +237,52 @@
%description -l pl.UTF-8
PHP jest językiem skryptowym, którego polecenia umieszcza się w
-plikach HTML. Jest próbą ułatwienia programistom pisania dynamicznie
-generowanych stron WWW. Oferuje także wbudowaną integrację z bazami
-danych dla kilku komercyjnych i niekomercyjnych systemów baz danych,
-co czyni tworzenie stron korzystających z baz danych w miarę łatwym.
-Najczęściej PHP jest używany prawdopodobnie jako zamiennik skryptów
-CGI. Moduł mod_php pozwala serwerowi WWW Apache rozumieć i przetwarzać
-język PHP osadzony w stronach. Ten pakiet zawiera php w wersji
-%{version}.
+plikach HTML. Jest próbą ułatwienia programistom pisania
+dynamicznie generowanych stron WWW. Oferuje także wbudowaną
+integrację z bazami danych dla kilku komercyjnych i niekomercyjnych
+systemów baz danych, co czyni tworzenie stron korzystających z baz
+danych w miarę łatwym. Najczęściej PHP jest używany
+prawdopodobnie jako zamiennik skryptów CGI. Moduł mod_php pozwala
+serwerowi WWW Apache rozumieć i przetwarzać język PHP osadzony w
+stronach. Ten pakiet zawiera php w wersji %{version}.
%description -l pt_BR.UTF-8
PHP: Preprocessador de Hipertexto versão 4 é uma linguagem script
-embutida em HTML. Muito de sua sintaxe é emprestada de C, Java e Perl,
-com algumas características únicas, específicas ao PHP. O objetivo da
-linguagem é permitir que desenvolvedores web escrevam páginas
-dinamicamente geradas de forma rápida.
+embutida em HTML. Muito de sua sintaxe é emprestada de C, Java e
+Perl, com algumas características únicas, específicas ao PHP. O
+objetivo da linguagem é permitir que desenvolvedores web escrevam
+páginas dinamicamente geradas de forma rápida.
%description -l ru.UTF-8
-PHP - это язык написания скриптов, встраиваемых в HTML-код. PHP
-предлагает интерграцию с множеством СУБД, поэтому написание скриптов
-для работы с базами данных относительно просто. Наиболее популярное
-использование PHP - замена для CGI скриптов.
-
-Этот пакет содержит самодостаточную (CGI) версию интерпретатора языка.
-Вы должны также установить пакет %{name}-common. Если вам нужен
-интерпретатор PHP в качестве модуля apache, установите пакет
-apache-mod_php.
+PHP - это язык написания скриптов,
+встраиваемых в HTML-код. PHP предлагает
+интерграцию с множеством СУБД,
+поэтому написание скриптов для работы
+с базами данных относительно просто.
+Наиболее популярное использование PHP -
+замена для CGI скриптов.
+
+Этот пакет содержит самодостаточную
+(CGI) версию интерпретатора языка. Вы
+должны также установить пакет
+%{name}-common. Если вам нужен интерпретатор
+PHP в качестве модуля apache, установите
+пакет apache-mod_php.
%description -l uk.UTF-8
-PHP - це мова написання скриптів, що вбудовуються в HTML-код. PHP
-пропонує інтеграцію з багатьма СУБД, тому написання скриптів для
-роботи з базами даних є доволі простим. Найбільш популярне
-використання PHP - заміна для CGI скриптів.
-
-Цей пакет містить самодостатню (CGI) версію інтерпретатора мови. Ви
-маєте також встановити пакет %{name}-common. Якщо вам потрібен
-інтерпретатор PHP в якості модуля apache, встановіть пакет
-apache-mod_ph
SPECS: php-pecl-xdebug.spec - up to 2.0.3 on HEAD
Author: zergin Date: Fri May 23 18:39:43 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 2.0.3 on HEAD
Files affected:
SPECS:
php-pecl-xdebug.spec (1.46 -> 1.47)
Diffs:
Index: SPECS/php-pecl-xdebug.spec
diff -u SPECS/php-pecl-xdebug.spec:1.46 SPECS/php-pecl-xdebug.spec:1.47
--- SPECS/php-pecl-xdebug.spec:1.46 Mon Nov 26 23:21:28 2007
+++ SPECS/php-pecl-xdebug.spec Fri May 23 20:39:37 2008
@@ -6,12 +6,12 @@
Summary: %{_modname} - provides functions for functions traces and
profiling
Summary(pl.UTF-8): %{_modname} - funkcje do śledzenia i profilowania
funkcji
Name: php-pecl-%{_modname}
-Version: 2.0.2
+Version: 2.0.3
Release: 1
License: BSD style
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz
-# Source0-md5: b994465f9941db4e7ffa4f8b81fa5c3d
+# Source0-md5: 0735584168c8c9f111252128d0076d7c
Source1: %{name}.ini
URL: http://pecl.php.net/package/xdebug/
BuildRequires: libedit-devel
@@ -117,6 +117,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.47 2008-05-23 18:39:37 zergin
+- up to 2.0.3 on HEAD
+
Revision 1.46 2007-11-26 22:21:28 adamg
- complete xdebug.ini
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-pecl-xdebug.spec?r1=1.46&r2=1.47&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): kde4-kdewebdev.spec - up to 4.1.71 (builds, not tested in us...
Author: zergin Date: Fri Nov 7 00:04:56 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- up to 4.1.71 (builds, not tested in use)
- removed Source1 (some PNG; doesn't exist and it's unused)
Files affected:
SPECS:
kde4-kdewebdev.spec (1.19.2.3 -> 1.19.2.4)
Diffs:
Index: SPECS/kde4-kdewebdev.spec
diff -u SPECS/kde4-kdewebdev.spec:1.19.2.3 SPECS/kde4-kdewebdev.spec:1.19.2.4
--- SPECS/kde4-kdewebdev.spec:1.19.2.3 Mon Oct 20 02:55:57 2008
+++ SPECS/kde4-kdewebdev.spec Fri Nov 7 01:04:51 2008
@@ -6,13 +6,12 @@
Summary(pl.UTF-8): Narzędzia do tworzenia WWW dla KDE
Summary(pt_BR.UTF-8): Um editor web para o KDE
Name: kde4-kdewebdev
-Version: 4.1.68
-Release: 2
+Version: 4.1.71
+Release: 1
License: GPL
Group: X11/Development/Tools
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 2d89b40daab648a34a7b4cf44649965a
-Source1: %{orgname}-kommandersplash.png
+# Source0-md5: ab33c01c00369528db1b5e67baf4f818
URL: http://www.kde.org/
BuildRequires: boost-devel
BuildRequires: kde4-kdelibs-devel >= %{version}
@@ -459,6 +458,10 @@
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.19.2.4 2008/11/07 00:04:51 zergin
+- up to 4.1.71 (builds, not tested in use)
+- removed Source1 (some PNG; doesn't exist and it's unused)
+
Revision 1.19.2.3 2008/10/20 00:55:57 shadzik
- rel up and qtver bump up
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdewebdev.spec?r1=1.19.2.3&r2=1.19.2.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kdewebdev-4.1.71.tar.bz2
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/unstable/4.1.71/src/kdewebdev-4.1.71.tar.bz2 ab33c01c00369528db1b5e67baf4f818 kdewebdev-4.1.71.tar.bz2 Size: 3399114 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
SPECS (DEVEL): amarok.spec - package plasama files
Author: zergin Date: Sat Nov 8 01:40:51 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- package plasama files
Files affected:
SPECS:
amarok.spec (1.123.2.37 -> 1.123.2.38)
Diffs:
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.37 SPECS/amarok.spec:1.123.2.38
--- SPECS/amarok.spec:1.123.2.37Thu Nov 6 23:00:18 2008
+++ SPECS/amarok.spec Sat Nov 8 02:40:45 2008
@@ -191,6 +191,7 @@
%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_mediadevices.so
%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-mtpcollection.so
+%attr(755,root,root) %{_libdir}/kde4/plasma_animator_default.so
%attr(755,root,root) %{_libdir}/libamarok_taglib.so
%attr(755,root,root) %{_libdir}/libamaroklib.so
%attr(755,root,root) %{_libdir}/libamarokplasma.so
@@ -238,10 +239,12 @@
%{_datadir}/kde4/services/amarok-data-engine-cloud.desktop
%{_datadir}/kde4/services/amarok_collection-ipodcollection.desktop
%{_datadir}/kde4/services/amarok_service_opmldirectory.desktop
+%{_datadir}/kde4/services/plasma-animator-default.desktop
%{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
%{_datadir}/kde4/servicetypes/amarok_data_engine.desktop
%{_datadir}/kde4/servicetypes/amarok_plugin.desktop
%{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
+%{_datadir}/kde4/servicetypes/plasma-*.desktop
%{_desktopdir}/kde4/amarok.desktop
%{_iconsdir}/*/*/apps/amarok.*
@@ -274,6 +277,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.123.2.38 2008/11/08 01:40:45 zergin
+- package plasama files
+
Revision 1.123.2.37 2008/11/06 22:00:18 tommat
- BR: giflib-devel curl-devel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.123.2.37&r2=1.123.2.38&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): kde4-kdesdk.spec - up to 4.1.72 (builds and works)
Author: zergin Date: Sat Nov 8 01:41:31 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- up to 4.1.72 (builds and works)
Files affected:
SPECS:
kde4-kdesdk.spec (1.21.2.6 -> 1.21.2.7)
Diffs:
Index: SPECS/kde4-kdesdk.spec
diff -u SPECS/kde4-kdesdk.spec:1.21.2.6 SPECS/kde4-kdesdk.spec:1.21.2.7
--- SPECS/kde4-kdesdk.spec:1.21.2.6 Tue Oct 28 02:05:31 2008
+++ SPECS/kde4-kdesdk.spec Sat Nov 8 02:41:25 2008
@@ -6,12 +6,12 @@
Summary: KDESDK - Software Development Kit for KDE
Summary(pl.UTF-8): KDESDK - Wsparcie programistyczne dla KDE
Name: kde4-kdesdk
-Version: 4.1.71
-Release: 2
+Version: 4.1.72
+Release: 1
License: GPL
Group: X11/Development/Tools
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: f3402643318fc7c311f914160cbeca34
+# Source0-md5: cdf048f9ecce67117aa8e9b4509632ab
Patch0:%{name}-kiosvn.patch
URL: http://www.kde.org/
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -1014,6 +1014,9 @@
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.21.2.7 2008/11/08 01:41:25 zergin
+- up to 4.1.72 (builds and works)
+
Revision 1.21.2.6 2008/10/28 01:05:31 shadzik
- add patch0
- update qt4 BRs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdesdk.spec?r1=1.21.2.6&r2=1.21.2.7&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kdesdk-4.1.72.tar.bz2
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/unstable/4.1.72/src/kdesdk-4.1.72.tar.bz2 cdf048f9ecce67117aa8e9b4509632ab kdesdk-4.1.72.tar.bz2 Size: 5405506 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
SPECS (DEVEL): amarok.spec - revert (those files conflict)
Author: zergin Date: Sat Nov 8 03:39:31 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- revert (those files conflict)
Files affected:
SPECS:
amarok.spec (1.123.2.38 -> 1.123.2.39)
Diffs:
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.38 SPECS/amarok.spec:1.123.2.39
--- SPECS/amarok.spec:1.123.2.38Sat Nov 8 02:40:45 2008
+++ SPECS/amarok.spec Sat Nov 8 04:39:26 2008
@@ -191,7 +191,6 @@
%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-sqlcollection.so
%attr(755,root,root) %{_libdir}/kde4/amarok_context_applet_mediadevices.so
%attr(755,root,root) %{_libdir}/kde4/libamarok_collection-mtpcollection.so
-%attr(755,root,root) %{_libdir}/kde4/plasma_animator_default.so
%attr(755,root,root) %{_libdir}/libamarok_taglib.so
%attr(755,root,root) %{_libdir}/libamaroklib.so
%attr(755,root,root) %{_libdir}/libamarokplasma.so
@@ -239,12 +238,10 @@
%{_datadir}/kde4/services/amarok-data-engine-cloud.desktop
%{_datadir}/kde4/services/amarok_collection-ipodcollection.desktop
%{_datadir}/kde4/services/amarok_service_opmldirectory.desktop
-%{_datadir}/kde4/services/plasma-animator-default.desktop
%{_datadir}/kde4/servicetypes/amarok_context_applet.desktop
%{_datadir}/kde4/servicetypes/amarok_data_engine.desktop
%{_datadir}/kde4/servicetypes/amarok_plugin.desktop
%{_datadir}/kde4/servicetypes/amarok_codecinstall.desktop
-%{_datadir}/kde4/servicetypes/plasma-*.desktop
%{_desktopdir}/kde4/amarok.desktop
%{_iconsdir}/*/*/apps/amarok.*
@@ -277,6 +274,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.123.2.39 2008/11/08 03:39:26 zergin
+- revert (those files conflict)
+
Revision 1.123.2.38 2008/11/08 01:40:45 zergin
- package plasama files
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.123.2.38&r2=1.123.2.39&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kdeextragear-graphics-880234.tar.bz2
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/unstable/snapshots/kdeextragear-graphics-880234.tar.bz2 fa95171348c6891057c2703ab358ef87 kdeextragear-graphics-880234.tar.bz2 Size: 14569409 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
DISTFILES: kdeextragear-multimedia-880262.tar.bz2
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/unstable/snapshots/kdeextragear-multimedia-880262.tar.bz2 b76bbda0b266e0045a02b141a11f405d kdeextragear-multimedia-880262.tar.bz2 Size: 12527121 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
DISTFILES: kdevplatform-880297.tar.bz2
Files fetched: 1 STORED: ftp://ftp.kde.org/pub/kde/unstable/snapshots/kdevplatform-880297.tar.bz2 d7cabd6787b6cf9b9812b67982c0adfc kdevplatform-880297.tar.bz2 Size: 1039841 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
SPECS: kde4-kdevplatform.spec - up to snap 880297 - package new files, remo...
Author: zergin Date: Sat Nov 8 15:50:22 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- up to snap 880297
- package new files, remove nonexistend
- addat cmake patch (Path0)
Files affected:
SPECS:
kde4-kdevplatform.spec (1.9 -> 1.10)
Diffs:
Index: SPECS/kde4-kdevplatform.spec
diff -u SPECS/kde4-kdevplatform.spec:1.9 SPECS/kde4-kdevplatform.spec:1.10
--- SPECS/kde4-kdevplatform.spec:1.9Sat Sep 27 15:10:37 2008
+++ SPECS/kde4-kdevplatform.specSat Nov 8 16:50:16 2008
@@ -1,17 +1,18 @@
# $Revision$, $Date$
%define_state unstable
%defineorgname kdevplatform
-%define_rel863954
+%define_rel880297
Summary: kdevplatform
Summary(pl.UTF-8): kdevplatform
Name: kde4-kdevplatform
-Version: 4.1.67
+Version: 4.1.72
Release: 0.%{_rel}.1
License: GPL
Group: X11/Development/Tools
Source0:
ftp://ftp.kde.org/pub/kde/%{_state}/snapshots/%{orgname}-%{_rel}.tar.bz2
-# Source0-md5: 78ce8758205ddea291d52a1382cb2051
+# Source0-md5: d7cabd6787b6cf9b9812b67982c0adfc
+Patch0:%{name}-cmake.patch
URL: http://www.kdevelop.org/
BuildRequires: commoncpp2-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,6 +39,7 @@
%prep
%setup -q -n %{orgname}-%{_rel}
+%patch0 -p1
%build
mkdir build
@@ -64,7 +66,7 @@
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kdevteamwork_server
-%attr(755,root,root) %{_bindir}/lcov_geninfo
+#%attr(755,root,root) %{_bindir}/lcov_geninfo
%attr(755,root,root) %{_libdir}/libkdevplatforminterfaces.so.*.*.*
%attr(755,root,root) %{_libdir}/libkdevplatforminterfaces.so.?
@@ -76,6 +78,8 @@
%attr(755,root,root) %{_libdir}/libkdevplatformproject.so.?
%attr(755,root,root) %{_libdir}/libkdevplatformshell.so.*.*.*
%attr(755,root,root) %{_libdir}/libkdevplatformshell.so.?
+%attr(755,root,root) %{_libdir}/libkdevplatformtestshell.so.*.*.*
+%attr(755,root,root) %{_libdir}/libkdevplatformtestshell.so.?
%attr(755,root,root) %{_libdir}/libkdevplatformutil.so.*.*.*
%attr(755,root,root) %{_libdir}/libkdevplatformutil.so.?
%attr(755,root,root) %{_libdir}/libkdevplatformvcs.so.*.*.*
@@ -85,11 +89,11 @@
%attr(755,root,root) %{_libdir}/libdiff2.so
%attr(755,root,root) %{_libdir}/libdynamictext.so
%attr(755,root,root) %{_libdir}/libkdevplatformveritas.so
-%attr(755,root,root) %{_libdir}/libkdevveritascoverage.so
+#%attr(755,root,root) %{_libdir}/libkdevveritascoverage.so
%attr(755,root,root) %{_libdir}/libnetwork.so
%attr(755,root,root) %{_libdir}/kde4/kdevbzr.so
-%attr(755,root,root) %{_libdir}/kde4/kdevcoverage.so
+#%attr(755,root,root) %{_libdir}/kde4/kdevcoverage.so
%attr(755,root,root) %{_libdir}/kde4/kdevgit.so
%attr(755,root,root) %{_libdir}/kde4/kdevhg.so
%attr(755,root,root) %{_libdir}/kde4/kdevkrossplugin.so
@@ -102,7 +106,7 @@
%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_projectsettings.so
%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_runsettings.so
%attr(755,root,root) %{_libdir}/kde4/kcm_kdev_uisettings.so
-%attr(755,root,root) %{_libdir}/kde4/kdevclassbrowser.so
+#%attr(755,root,root) %{_libdir}/kde4/kdevclassbrowser.so
%attr(755,root,root) %{_libdir}/kde4/kdevcvs.so
%attr(755,root,root) %{_libdir}/kde4/kdevduchainview.so
%attr(755,root,root) %{_libdir}/kde4/kdevexecute.so
@@ -120,8 +124,8 @@
%attr(755,root,root) %{_libdir}/kde4/kdevsourceformatter.so
%dir %{_datadir}/apps/kdevstandardoutputview
%{_datadir}/apps/kdevstandardoutputview/kdevstandardoutputview.rc
-%dir %{_datadir}/apps/kdevclassbrowser
-%{_datadir}/apps/kdevclassbrowser/kdevclassbrowser.rc
+#%dir %{_datadir}/apps/kdevclassbrowser
+#%{_datadir}/apps/kdevclassbrowser/kdevclassbrowser.rc
%dir %{_datadir}/apps/kdevbzr
%{_datadir}/apps/kdevbzr/kdevbzr.rc
%dir %{_datadir}/apps/kdevcvs
@@ -138,8 +142,8 @@
%{_datadir}/apps/kdevquickopen/kdevquickopen.rc
%dir %{_datadir}/apps/kdevcontextbrowser
%{_datadir}/apps/kdevcontextbrowser/kdevcontextbrowser.rc
-%dir %{_datadir}/apps/kdevcoverage
-%{_datadir}/apps/kdevcoverage/kdevcoverage.rc
+#%dir %{_datadir}/apps/kdevcoverage
+#%{_datadir}/apps/kdevcoverage/kdevcoverage.rc
%dir %{_datadir}/apps/kdevgit
%{_datadir}/apps/kdevgit/kdevgit.rc
%dir %{_datadir}/apps/kdevhg
@@ -161,10 +165,14 @@
%{_libdir}/libkdevplatformoutputview.so
%{_libdir}/libkdevplatformproject.so
%{_libdir}/libkdevplatformshell.so
+%{_libdir}/libkdevplatformtestshell.so
%{_libdir}/libkdevplatformutil.so
%{_libdir}/libkdevplatformvcs.so
%{_libdir}/libsublime.so
%{_datadir}/apps/cmake/modules/FindKDevPlatform.cmake
+%{_libdir}/kdevplatform/KDevPlatformConfig.cmake
+%{_libdir}/kdevplatform/KDevPlatformConfigVersion.cmake
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -172,6
SOURCES: kde4-kdevplatform-cmake.patch (NEW) - kde4-kdevplatform cmake patch
Author: zergin Date: Sat Nov 8 15:50:49 2008 GMT
Module: SOURCES Tag: HEAD
Log message:
- kde4-kdevplatform cmake patch
Files affected:
SOURCES:
kde4-kdevplatform-cmake.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/kde4-kdevplatform-cmake.patch
diff -u /dev/null SOURCES/kde4-kdevplatform-cmake.patch:1.1
--- /dev/null Sat Nov 8 16:50:49 2008
+++ SOURCES/kde4-kdevplatform-cmake.patch Sat Nov 8 16:50:43 2008
@@ -0,0 +1,11 @@
+diff -ur kdevplatform-880297/kross/CMakeLists.txt mod/kross/CMakeLists.txt
+--- kdevplatform-880297/kross/CMakeLists.txt 2008-11-05 05:59:18.0
+0100
mod/kross/CMakeLists.txt 2008-11-08 15:17:45.847707040 +0100
+@@ -79,7 +79,6 @@
+ wrappers/krossiprojectfilemanager.cpp
+ wrappers/krossiprojectbuilder.cpp
+ wrappers/krossirun.cpp
+-wrappers/krosseditorcontext.cpp
+ )
+
+ kde4_add_plugin(kdevkrossplugin ${kdevkrossplugin_SRCS})
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kde4-kdeextragear-graphics.spec - up to 880234: builds, not tested i...
Author: zergin Date: Sat Nov 8 12:12:52 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 880234: builds, not tested in use yet
Files affected:
SPECS:
kde4-kdeextragear-graphics.spec (1.15 -> 1.16)
Diffs:
Index: SPECS/kde4-kdeextragear-graphics.spec
diff -u SPECS/kde4-kdeextragear-graphics.spec:1.15
SPECS/kde4-kdeextragear-graphics.spec:1.16
--- SPECS/kde4-kdeextragear-graphics.spec:1.15 Thu Oct 9 22:05:40 2008
+++ SPECS/kde4-kdeextragear-graphics.spec Sat Nov 8 13:12:47 2008
@@ -1,17 +1,17 @@
# $Revision$, $Date$
%defineorgname kdeextragear-graphics
-%definesnap869073
+%definesnap880234
%defineqtver 4.4.1
Summary: Kipi (KDE Image Plugin Interface)
Summary(pl.UTF-8): Kipi (KDE Image Plugin Interface)
Name: kde4-kdeextragear-graphics
-Version: 4.1.68
+Version: 4.1.72
Release: 0.%{snap}.1
License: GPL v2+
Group: X11/Libraries
Source0:
ftp://ftp.kde.org/pub/kde/unstable/snapshots/%{orgname}-%{snap}.tar.bz2
-# Source0-md5: ca21bf2a9f7300855eccaab01c6c4fe2
+# Source0-md5: fa95171348c6891057c2703ab358ef87
URL: http://extragear.kde.org/apps/kipi/
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtCore-devel >= %{qtver}
@@ -289,9 +289,9 @@
%attr(755,root,root) %{_libdir}/kde4/kio_digikamdates.so
%attr(755,root,root) %{_libdir}/kde4/kio_digikamsearch.so
%attr(755,root,root) %{_libdir}/kde4/kio_digikamtags.so
-%attr(755,root,root) %{_libdir}/libdigikam.so
-%attr(755,root,root) %{_libdir}/libdigikam.so.1
-%attr(755,root,root) %{_libdir}/libdigikam.so.1.0.0
+%attr(755,root,root) %{_libdir}/libdigikamcore.so
+%attr(755,root,root) %{_libdir}/libdigikamcore.so.1
+%attr(755,root,root) %{_libdir}/libdigikamcore.so.1.0.0
%attr(755,root,root) %{_libdir}/libdigikamdatabase.so
%attr(755,root,root) %{_libdir}/libdigikamdatabase.so.1
%attr(755,root,root) %{_libdir}/libdigikamdatabase.so.1.0.0
@@ -535,6 +535,9 @@
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.16 2008/11/08 12:12:47 zergin
+- up to 880234: builds, not tested in use yet
+
Revision 1.15 2008/10/09 20:05:40 paszczus
- fixed %files
- some cleanup
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdeextragear-graphics.spec?r1=1.15&r2=1.16&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): amarok.spec - rel up (to 2) - added R: kde4-phonon (though i...
Author: zergin Date: Sat Nov 8 13:35:12 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- rel up (to 2)
- added R: kde4-phonon (though it runs w/o it's useless as there is no
sound)
Files affected:
SPECS:
amarok.spec (1.123.2.39 -> 1.123.2.40)
Diffs:
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.39 SPECS/amarok.spec:1.123.2.40
--- SPECS/amarok.spec:1.123.2.39Sat Nov 8 04:39:26 2008
+++ SPECS/amarok.spec Sat Nov 8 14:35:06 2008
@@ -6,7 +6,7 @@
Summary(pl.UTF-8): Odtwarzacz audio dla KDE
Name: amarok
Version: 1.94
-Release: 1
+Release: 2
License: GPL
Group: X11/Applications/Multimedia
Source0:
ftp://ftp.kde.org/pub/kde/%{state}/amarok/%{version}/src/%{name}-%{version}.tar.bz2
@@ -55,6 +55,7 @@
Requires(post):/sbin/ldconfig
Requires: kde4-kdebase-core
Requires: kde4-kdemultimedia-audiocd
+Requires: kde4-phonon
Suggests: libvisual-plugin-actor-JESS
Suggests: libvisual-plugin-actor-bumpscope
Suggests: libvisual-plugin-actor-corona
@@ -274,6 +275,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.123.2.40 2008/11/08 13:35:06 zergin
+- rel up (to 2)
+- added R: kde4-phonon (though it runs w/o it's useless as there is no
+ sound)
+
Revision 1.123.2.39 2008/11/08 03:39:26 zergin
- revert (those files conflict)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.123.2.39&r2=1.123.2.40&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: kde4-kdeextragear-multimedia.spec - up to snap 880262 (seems to wok ...
Author: zergin Date: Sat Nov 8 13:05:04 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- up to snap 880262 (seems to wok fine)
Files affected:
SPECS:
kde4-kdeextragear-multimedia.spec (1.25 -> 1.26)
Diffs:
Index: SPECS/kde4-kdeextragear-multimedia.spec
diff -u SPECS/kde4-kdeextragear-multimedia.spec:1.25
SPECS/kde4-kdeextragear-multimedia.spec:1.26
--- SPECS/kde4-kdeextragear-multimedia.spec:1.25Mon Oct 27 11:34:26 2008
+++ SPECS/kde4-kdeextragear-multimedia.spec Sat Nov 8 14:04:58 2008
@@ -1,15 +1,15 @@
# $Revision$, $Date$
%defineorgname kdeextragear-multimedia
-%definesnap 874620
+%definesnap 880262
Summary: extra multimedia
Summary(pl.UTF-8): Dodatkowe programy multimedialne
Name: kde4-kdeextragear-multimedia
-Version: 4.1.71
+Version: 4.1.72
Release: 0.%{snap}.1
License: GPL v2+
Group: X11/Libraries
Source0:
ftp://ftp.kde.org/pub/kde/unstable/snapshots/%{orgname}-%{snap}.tar.bz2
-# Source0-md5: 0062c682618d59f66dd7d8e201f7f7af
+# Source0-md5: b76bbda0b266e0045a02b141a11f405d
URL: http://extragear.kde.org/apps/kipi/
Patch0:%{name}-NJB.patch
BuildRequires: QtNetwork-devel >= 4.4.1
@@ -291,6 +291,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.26 2008/11/08 13:04:58 zergin
+- up to snap 880262 (seems to wok fine)
+
Revision 1.25 2008/10/27 10:34:26 paszczus
- updated to 4.1.71 snap 874620
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdeextragear-multimedia.spec?r1=1.25&r2=1.26&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - up to snap 2008.11.08 21:30 - Patch38 (tds) obsol...
Author: zergin Date: Sun Nov 9 01:36:57 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- up to snap 2008.11.08 21:30
- Patch38 (tds) obsolete, already upstream
- dropped mime_magic, finaly fully dropped from upstream
- NfFY (Not fully Functional Yet ;-) ) - work in progress
compiles --without ming, sybase_ct, xmlrpc
Files affected:
SPECS:
php.spec (1.688.2.17 -> 1.688.2.18)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.17 SPECS/php.spec:1.688.2.18
--- SPECS/php.spec:1.688.2.17 Wed Aug 13 10:22:34 2008
+++ SPECS/php.spec Sun Nov 9 02:36:51 2008
@@ -26,7 +26,6 @@
%bcond_without interbase # without InterBase extension module
%bcond_without ldap# without LDAP extension module
%bcond_without mhash # without mhash extension module
-%bcond_without mime_magic # without mime-magic module
%bcond_without ming# without ming extension module
%bcond_without mm # without mm support for session storage
%bcond_without mssql # without MS SQL extension module
@@ -68,7 +67,7 @@
%endif
%define_rel0.18
-%define_snap 200808101830
+%define_snap 200811082130
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -82,7 +81,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: efc03522ee7fe966f2fb827bc1a0ab31
+# Source0-md5: e4e977f880e3df1b3ff9c0d3210ab9b7
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -122,6 +121,7 @@
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
Patch38: %{name}-tds.patch
+
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -799,22 +799,6 @@
%description mhash -l pl.UTF-8
Moduł PHP udostępniający funkcje mieszające z biblioteki mhash.
-%package mime_magic
-Summary: mime_magic extension module for PHP
-Summary(pl.UTF-8): Moduł mime_magic dla PHP
-Group: Libraries
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/share/file/magic.mime
-Provides: php(mime_magic)
-
-%description mime_magic
-This PHP module adds support for MIME type lookup via file magic
-numbers using magic.mime database.
-
-%description mime_magic -l pl.UTF-8
-Moduł PHP dodający obsługę wyszukiwania typów MIME według magicznych
-znaczników plików z użyciem bazy danych magic.mime.
-
%package ming
Summary: ming extension module for PHP
Summary(pl.UTF-8): Moduł ming dla PHP
@@ -1526,7 +1510,7 @@
%patch9 -p1
cp php.ini-dist php.ini
-%patch10 -p1
+#%patch10 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -1548,7 +1532,7 @@
%patch29 -p1
%patch31 -p1
-%patch38 -p1
+#%patch38 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1708,7 +1692,7 @@
--with-iconv=shared \
--with-freetype-dir=shared \
--with-gettext=shared \
- --with-gd=shared,/usr \
+ --with-gd=shared \
--with-gdbm \
--with-gmp=shared \
%{?with_imap:--with-imap=shared --with-imap-ssl} \
@@ -1717,7 +1701,6 @@
%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
--with-mcrypt=shared \
%{?with_mhash:--with-mhash=shared} \
-
%{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic}%{!?with_mime_magic:--disable-mime-magic}
\
%{?with_ming:--with-ming=shared} \
%{?with_mm:--with-mm} \
%{?with_mssql:--with-mssql=shared} \
@@ -1995,7 +1978,6 @@
%extension_scripts mbstring
%extension_scripts mcrypt
%extension_scripts mhash
-%extension_scripts mime_magic
%extension_scripts ming
%extension_scripts mssql
%extension_scripts mysql
@@ -2094,9 +2076,6 @@
%triggerun mhash -- %{name}-mhash < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mhash\.so/d'
%{_sysconfdir}/php.ini
-%triggerun mime_magic -- %{name}-mime_magic < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mime_magic\.so/d'
%{_sysconfdir}/php.ini
-
%triggerun ming -- %{name}-ming < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ming\.so/d'
%{_sysconfdir}/php.ini
@@ -2405,13 +2384,6 @@
%attr(755,root,root) %{php_extensiondir}/mhash.so
%endif
-%if %{with mime_magic}
-%files mime_magic
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/mime_magic.ini
-%attr(755,root,root) %{php_extensiondir}/mime_magic.so
-%endif
-
%if %{with ming}
%files ming
%defattr(644,ro
DISTFILES: php5.3-200811082130.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200811082130.tar.bz2 e4e977f880e3df1b3ff9c0d3210ab9b7 php5.3-200811082130.tar.bz2 Size: 10488479 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- 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): php/php.spec - add bcond_with to build with experimental ...
Author: zergin Date: Sun Jul 5 00:29:50 2009 GMT
Module: packages Tag: DEVEL
Log message:
- add bcond_with to build with experimental strict type hinting
- package missing intl extension
Files affected:
packages/php:
php.spec (1.688.2.33 -> 1.688.2.34)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.688.2.33 packages/php/php.spec:1.688.2.34
--- packages/php/php.spec:1.688.2.33Wed Jul 1 00:32:01 2009
+++ packages/php/php.spec Sun Jul 5 02:29:44 2009
@@ -60,6 +60,7 @@
%bcond_without apache2 # disable building apache 2.x module
%bcond_without zts # disable experimental-zts
%bcond_withtests # default off; test process very often hangs on
buildersl; perform "make test"
+%bcond_withtype_hints # experimental support for strict typing/casting
%define apxs1 /usr/sbin/apxs1
%defineapxs2 /usr/sbin/apxs
@@ -87,7 +88,7 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
Version: 5.3.0
-Release: %{rel}
+Release: %{rel}%{?with_type_hints:th}
Epoch: 4
License: PHP
Group: Libraries
@@ -120,6 +121,9 @@
Patch31: %{name}-fcgi-graceful.patch
Patch38: %{name}-tds.patch
Patch43: %{name}-use-prog_sendmail.patch
+%if %{with type_hints}
+Patch50: http://ilia.ws/patch/type_hint_53_v2.txt
+%endif
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -748,6 +752,24 @@
%description interbase -l pl.UTF-8
Moduł PHP umożliwiający dostęp do baz danych InterBase i Firebird.
+%package intl
+Summary: Internationalization extension (ICU wrapper)
+Summary(pl.UTF-8): Rozszerzenie do internacjonalizacji (wrapper ICU)
+Group: Libraries
+URL: http://www.php.net/manual/en/book.ibase.php
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: php(intl)
+
+%description intl
+Internationalization extension (further is referred as Intl) is a wrapper
+for ICU library, enabling PHP programmers to perform UCA-conformant
+collation and date/time/number/currency formatting in their scripts.
+
+%description intl -l pl.UTF-8
+Rozszerzenie do internacjonalizacji (dalej nazywane Intl) jest wrapperem
+biblioteki ICU, pozwalającym programistom PHP na wykonywanie w skryptach
+porównań zdgodnych z UCA oraz formatowań daty/czasu/walut.
+
%package json
Summary: PHP C extension for JSON serialization
Summary(pl.UTF-8): Rozszerzenie C PHP dla serializacji JSON
@@ -1558,6 +1580,11 @@
%prep
%setup -q
+
+%if %{with type_hints}
+%patch50 -p0
+%endif
+
%patch0 -p1
%patch1 -p1
#%patch2 -p1
@@ -2012,6 +2039,7 @@
%extension_scripts iconv
%extension_scripts imap
%extension_scripts interbase
+%extension_scripts intl
%extension_scripts json
%extension_scripts ldap
%extension_scripts mbstring
@@ -2102,6 +2130,9 @@
%triggerun interbase -- %{name}-interbase < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*interbase\.so/d'
%{_sysconfdir}/php.ini
+%triggerun intl -- %{name}-intl < 4:5.0.4-9.1
+%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*intl\.so/d'
%{_sysconfdir}/php.ini
+
%triggerun ldap -- %{name}-ldap < 4:5.0.4-9.1
%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ldap\.so/d'
%{_sysconfdir}/php.ini
@@ -2381,6 +2412,11 @@
%attr(755,root,root) %{php_extensiondir}/interbase.so
%endif
+%files intl
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/intl.ini
+%attr(755,root,root) %{php_extensiondir}/intl.so
+
%files json
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/json.ini
@@ -2679,6 +2715,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.688.2.34 2009/07/05 00:29:44 zergin
+- add bcond_with to build with experimental strict type hinting
+- package missing intl extension
+
Revision 1.688.2.33 2009/06/30 22:32:01 glen
- blocker so that somebody won't try to merge this to HEAD
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.688.2.33&r2=1.688.2.34&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (DEVEL): php/php.spec - fix docuentation URL for intl extension
Author: zergin Date: Sun Jul 5 00:30:46 2009 GMT
Module: packages Tag: DEVEL
Log message:
- fix docuentation URL for intl extension
Files affected:
packages/php:
php.spec (1.688.2.34 -> 1.688.2.35)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.688.2.34 packages/php/php.spec:1.688.2.35
--- packages/php/php.spec:1.688.2.34Sun Jul 5 02:29:44 2009
+++ packages/php/php.spec Sun Jul 5 02:30:41 2009
@@ -756,7 +756,7 @@
Summary: Internationalization extension (ICU wrapper)
Summary(pl.UTF-8): Rozszerzenie do internacjonalizacji (wrapper ICU)
Group: Libraries
-URL: http://www.php.net/manual/en/book.ibase.php
+URL: http://www.php.net/intl
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(intl)
@@ -2715,6 +2715,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.688.2.35 2009/07/05 00:30:41 zergin
+- fix docuentation URL for intl extension
+
Revision 1.688.2.34 2009/07/05 00:29:44 zergin
- add bcond_with to build with experimental strict type hinting
- package missing intl extension
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.688.2.34&r2=1.688.2.35&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (DEVEL): php_browscap.ini - updated browscap - removed quotation fr...
Author: zergin Date: Wed Jun 11 12:26:12 2008 GMT Module: SOURCES Tag: DEVEL Log message: - updated browscap - removed quotation from values so it won't confuse php 5.3 (see http://bugs.php.net/bug.php?id=45079 ) Files affected: SOURCES: php_browscap.ini (1.1 -> 1.1.2.1) Diffs: Index: SOURCES/php_browscap.ini diff -u SOURCES/php_browscap.ini:1.1 SOURCES/php_browscap.ini:1.1.2.1 --- SOURCES/php_browscap.ini:1.1Tue Nov 14 23:09:48 2006 +++ SOURCES/php_browscap.iniWed Jun 11 14:26:06 2008 @@ -1,20 +1,14 @@ ;;; Provided courtesy of http://browsers.garykeith.com -;;; Created on November 12, 2006 at 7:46:08 PM GMT -;;; http://forums.garykeith.com/changes -;;; -;;; ATTENTION SOFTWARE DEVELOPERS -;;; There are numerous upcoming changes to browscap.ini in the works. -;;; Please read the Developers forum to see how the changes will impact you! -;;; http://forums.garykeith.com/developers +;;; Created on April 30, 2008 at 1:27:09 PM GMT [GJK_Browscap_Version] -Version=3850 -Released=Sun, 12 Nov 2006 19:46:08 - +Version=4035 +Released=Wed, 30 Apr 2008 13:27:09 - DefaultProperties [DefaultProperties] -Browser="DefaultProperties" +Browser=DefaultProperties Version=0 MajorVer=0 MinorVer=0 @@ -53,70 +47,43 @@ [Ask] Parent=DefaultProperties -Browser="Ask" +Browser=Ask Frames=true Tables=true Crawler=true -[Mozilla/2.0 (compatible; Ask Jeeves)] +[Mozilla/?.0 (compatible; Ask Jeeves/Teoma*)] Parent=Ask -Browser="AskJeeves" +Browser=Teoma -[Mozilla/2.0 (compatible; Ask Jeeves/Teoma*)] +[Mozilla/2.0 (compatible; Ask Jeeves)] Parent=Ask -Browser="Teoma" +Browser=AskJeeves - Fast/AllTheWeb + Baidu -[Fast/AllTheWeb] +[Baidu] Parent=DefaultProperties -Browser="Fast/AllTheWeb" - -[*FAST Enterprise Crawler*] -Parent=Fast/AllTheWeb -Browser="FAST Enterprise Crawler" - -[FAST Data Search Document Retriever/4.0*] -Parent=Fast/AllTheWeb -Browser="FAST Data Search Document Retriever" - -[FAST MetaWeb Crawler (helpdesk at fastsearch dot com)] -Parent=Fast/AllTheWeb -Browser="FAST MetaWeb Crawler" - -[Fast PartnerSite Crawler*] -Parent=Fast/AllTheWeb -Browser="FAST PartnerSite" - -[FAST-WebCrawler/*] -Parent=Fast/AllTheWeb -Browser="FAST-WebCrawler" - -[FAST-WebCrawler/*/FirstPage*] -Parent=Fast/AllTheWeb -Browser="FAST-WebCrawler/FirstPage" - -[FAST-WebCrawler/*/Fresh*] -Parent=Fast/AllTheWeb -Browser="FAST-WebCrawler/Fresh" - -[FAST-WebCrawler/*/PartnerSite*] -Parent=Fast/AllTheWeb -Browser="FAST PartnerSite" +Browser=Baidu +Frames=true +Tables=true +Crawler=true -[FAST-WebCrawler/*?Multimedia*] -Parent=Fast/AllTheWeb -Browser="FAST-WebCrawler/Multimedia" +[BaiduImagespider*] +Parent=Baidu +Browser=BaiduImagespider +Stripper=true +isBanned=true -[FastSearch Web Crawler for*] -Parent=Fast/AllTheWeb -Browser="FastSearch Web Crawler" +[Baiduspider*] +Parent=Baidu +Browser=BaiDu Google [Google] Parent=DefaultProperties -Browser="Google" +Browser=Google Frames=true IFrames=true Tables=true @@ -125,76 +92,79 @@ [AdsBot-Google (*http://www.google.com/adsbot.html)] Parent=Google -Browser="AdsBot-Google" +Browser=AdsBot-Google [Feedfetcher-Google;*] Parent=Google -Browser="Feedfetcher-Google" +Browser=Feedfetcher-Google isSyndicationReader=true [Google-Sitemaps/*] Parent=Google -Browser="Google-Sitemaps" +Browser=Google-Sitemaps [Googlebot-Image/*] Parent=Google -Browser="Googlebot-Image" +Browser=Googlebot-Image CDF=true [googlebot-urlconsole] Parent=Google -Browser="googlebot-urlconsole" +Browser=googlebot-urlconsole [Googlebot/2.1 (*http://www.google.com/bot.html)] Parent=Google -Browser="Googlebot" +Browser=Googlebot [Googlebot/2.1 (*http://www.googlebot.com/bot.html)] Parent=Google -Browser="Googlebot" +Browser=Googlebot [Googlebot/Test*] Parent=Google -Browser="Googlebot/Test" +Browser=Googlebot/Test Google Search Appliance [gsa-crawler*] Parent=Google -Browser="Google Search Appliance" +Browser=Google Search Appliance Stripper=true isBanned=true -[Mediapartners-Google/*] +[Mediapartners-Google*] Parent=Google -Browser="Mediapartners-Google" +Browser=Mediapartners-Google [Mozilla/4.0 (compatible; Google Desktop)] Parent=Google -Browser="Google Desktop" +Browser=Google Desktop [Mozilla/4.0 (compatible; GoogleToolbar*)] Parent=Google -Browser="Google Toolbar" +Browser=Google Toolbar Stripper=true isBanned=true
SPECS (DEVEL): php.spec - adapted to new snap - libtoolize requires --ins...
Author: zergin Date: Wed Jun 11 12:28:14 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- adapted to new snap
- libtoolize requires --install to not remove config.{sub,guess}
- added php-ac.patch from MAIN (fixes posix build)
- fixed missing filter package (after pcre bcond removal)
Files affected:
SPECS:
php.spec (1.688.2.10 -> 1.688.2.11)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.10 SPECS/php.spec:1.688.2.11
--- SPECS/php.spec:1.688.2.10 Fri May 23 19:07:09 2008
+++ SPECS/php.spec Wed Jun 11 14:28:09 2008
@@ -65,16 +65,11 @@
%endif
%if %{without apache1} && %{without apache2}
-ERROR: You need to select at least one Apache SAPI to build shared
modules.
-%endif
-
-# filter depends on pcre
-%if %{without pcre}
-%undefine with_filter
+ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
%define_rel0.14
-%define_snap 200805231030
+%define_snap 200806111030
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -88,7 +83,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: dcd0e73852d4d322902f47f32593e223
+# Source0-md5: 93f22cdb11d380b140f891b7259c7a3a
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -127,9 +122,9 @@
Patch25: %{name}-zlib-for-getimagesize.patch
Patch26: %{name}-versioning.patch
Patch27: %{name}-linkflags-clean.patch
-Patch28: %{name}-pear.patch
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
+Patch35: %{name}-ac.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1604,10 +1599,9 @@
%patch25 -p1
%{?with_versioning:%patch26 -p1}
-# just for tabs?!
-%patch28 -p1
%patch29 -p1
%patch31 -p1
+%patch35 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1646,7 +1640,7 @@
export EXTENSION_DIR="%{php_extensiondir}"
if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
rm -f Makefile.{fcgi,cgi,cli,apxs{1,2}} # now remove Makefile copies
- %{__libtoolize}
+ %{__libtoolize} --install
%{__aclocal}
./buildconf --force
touch _built-conf
@@ -1673,7 +1667,7 @@
sapi_args=''
case $sapi in
cgi)
- sapi_args=' --disable-fastcgi --enable-discard-path
--enable-force-cgi-redirect'
+ sapi_args='--enable-discard-path --enable-force-cgi-redirect'
;;
cli)
sapi_args='--disable-cgi'
@@ -2772,6 +2766,12 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.688.2.11 2008-06-11 12:28:09 zergin
+- adapted to new snap
+ - libtoolize requires --install to not remove config.{sub,guess}
+ - added php-ac.patch from MAIN (fixes posix build)
+- fixed missing filter package (after pcre bcond removal)
+
Revision 1.688.2.10 2008-05-23 17:07:09 glen
- adapter has no brains, you should have it (revert crap caused by adapter and
commiter not looking what it did)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.10&r2=1.688.2.11&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php5.3-200806111030.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200806111030.tar.bz2 93f22cdb11d380b140f891b7259c7a3a php5.3-200806111030.tar.bz2 Size: 9839442 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- 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
SOURCES (DEVEL): php-no_pear_install.patch - Update for newer php 5.3 snaps
Author: zergin Date: Wed Jun 11 12:23:20 2008 GMT Module: SOURCES Tag: DEVEL Log message: - Update for newer php 5.3 snaps Files affected: SOURCES: php-no_pear_install.patch (1.6 -> 1.6.2.1) Diffs: Index: SOURCES/php-no_pear_install.patch diff -u SOURCES/php-no_pear_install.patch:1.6 SOURCES/php-no_pear_install.patch:1.6.2.1 --- SOURCES/php-no_pear_install.patch:1.6 Tue Jan 3 14:57:12 2006 +++ SOURCES/php-no_pear_install.patch Wed Jun 11 14:23:14 2008 @@ -1,11 +1,12 @@ php-5.0.0b3.orig/configure.in 2003-12-24 17:30:44.0 +0100 -+++ php-5.0.0b3/configure.in 2003-12-24 17:31:45.0 +0100 -@@ -1149,7 +1149,7 @@ - CXXFLAGS="$CXXFLAGS $standard_libtool_flag" - - all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)" --install_targets="$install_modules install-build install-headers install-programs $install_pear" -+install_targets="$install_modules install-build install-headers install-programs" - +diff -urN php5.3-200806102030/configure.in mod/configure.in +--- php5.3-200806102030/configure.in2008-06-02 18:33:55.0 + mod/configure.in2008-06-10 21:04:48.282651967 + +@@ -1353,7 +1353,7 @@ + fi; + + all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHAR_TARGET) $pharcmd" +-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" ++install_targets="$install_modules install-build install-headers install-programs $pharcmd_install" + case $PHP_SAPI in - cgi) + cli) CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-no_pear_install.patch?r1=1.6&r2=1.6.2.1&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - updated to snap: 2008.07.08 08:30 - drop patch35:...
Author: zergin Date: Tue Jul 8 11:44:23 2008 GMT
Module: SPECS Tag: DEVEL
Log message:
- updated to snap: 2008.07.08 08:30
- drop patch35: already in mainstream
- remove extensions:
- ncurses (moved to pecl)
- sybase (dropped; use sybase_ct now)
- PHP bug #45079 fixed, unquoted browscap values not required anymore.
- TODO: adapt to build with freetds 0.82 (missing tds.h required by
configure)
Files affected:
SPECS:
php.spec (1.688.2.11 -> 1.688.2.12)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.11 SPECS/php.spec:1.688.2.12
--- SPECS/php.spec:1.688.2.11 Wed Jun 11 14:28:09 2008
+++ SPECS/php.spec Tue Jul 8 13:44:17 2008
@@ -39,7 +39,6 @@
%bcond_without recode # without recode extension module
%bcond_without snmp# without SNMP extension module
%bcond_without sqlite # without SQLite extension module
-%bcond_without sybase # without Sybase extension module
%bcond_without sybase_ct # without Sybase-CT extension module
%bcond_without tidy# without Tidy extension module
%bcond_without wddx# without WDDX extension module
@@ -69,7 +68,7 @@
%endif
%define_rel0.14
-%define_snap 200806111030
+%define_snap 200807080830
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -83,7 +82,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: 93f22cdb11d380b140f891b7259c7a3a
+# Source0-md5: e48e452ecefa427fcc7dbe82cfd5fa5d
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -110,7 +109,6 @@
Patch13: %{name}-tsrmlsfetchgcc2.patch
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
-Patch16: %{name}-sybase-fix.patch
Patch17: %{name}-readline.patch
Patch18: %{name}-nohttpd.patch
Patch19: %{name}-gd_imagerotate_enable.patch
@@ -124,7 +122,6 @@
Patch27: %{name}-linkflags-clean.patch
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
-Patch35: %{name}-ac.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -142,7 +139,7 @@
%{?with_fcgi:BuildRequires:fcgi-devel}
%{?with_fdf:BuildRequires: fdftk-devel}
BuildRequires: flex
-%if %{with mssql} || %{with sybase} || %{with sybase_ct}
+%if %{with mssql} || %{with sybase_ct}
BuildRequires: freetds-devel
%endif
BuildRequires: freetype-devel >= 2.0
@@ -165,7 +162,6 @@
%{?with_mm:BuildRequires: mm-devel >= 1.3.0}
BuildRequires: mysql-devel >= 4.0.0
%{?with_mysqli:BuildRequires: mysql-devel >= 4.1.0}
-BuildRequires: ncurses-ext-devel
%{?with_ldap:BuildRequires:openldap-devel >= 2.3.0}
%if %{with openssl} || %{with ldap}
BuildRequires: openssl-devel >= 0.9.7d
@@ -899,20 +895,6 @@
Różnicą między nim a modułem mysql jest dostęp do funkcjonalności
MySQL w wersji 4.1 i nowszych.
-%package ncurses
-Summary: ncurses module for PHP
-Summary(pl.UTF-8): Moduł ncurses dla PHP
-Group: Libraries
-Requires: %{name}-cli = %{epoch}:%{version}-%{release}
-Provides: php(ncurses)
-
-%description ncurses
-This PHP module adds support for ncurses functions (only for cli and
-cgi SAPIs).
-
-%description ncurses -l pl.UTF-8
-Moduł PHP dodający obsługę funkcji ncurses (tylko do SAPI cli i cgi).
-
%package oci8
Summary: Oracle 8+ database module for PHP
Summary(pl.UTF-8): Moduł bazy danych Oracle 8+ dla PHP
@@ -1320,26 +1302,6 @@
zapisuje dane bezpośrednio z/do plików baz danych znajdujących się na
dysku.
-%package sybase
-Summary: Sybase DB extension module for PHP
-Summary(pl.UTF-8): Moduł Sybase DB dla PHP
-Group: Libraries
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: php(sybase)
-Obsoletes: php-sybase-ct
-Conflicts: php-sybase-ct
-
-%description sybase
-This is a dynamic shared object (DSO) for PHP that will add Sybase and
-MS SQL databases support through SYBDB library. Currently Sybase
-module is not maintained. Using Sybase-CT module is recommended
-instead.
-
-%description sybase -l pl.UTF-8
-Moduł PHP dodający obsługę baz danych Sybase oraz MS SQL poprzez
-bibliotekę SYBDB. W chwili obecnej moduł Sybase nie jest wspierany.
-Zaleca się używanie modułu Sybase-CT.
-
%package sybase-ct
Summary: Sybase-CT extension module for PHP
Summary(pl.UTF-8): Moduł Sybase-CT dla PHP
@@ -1583,7 +1545,6 @@
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
%patch17 -p1
%patch18 -
DISTFILES: php5.3-200807080830.tar.bz2 hardening-patch-5.0.4-0.3.0.patch.gz
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200807080830.tar.bz2 e48e452ecefa427fcc7dbe82cfd5fa5d php5.3-200807080830.tar.bz2 Size: 9886704 bytes ALREADY GOT: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz 47a742fa9fab2826ad10c13a2376111a hardening-patch-5.0.4-0.3.0.patch.gz -- 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: php/php.spec, php/php-bug-48880.patch (NEW) - add patch for bug #...
Author: zergin Date: Tue Aug 18 17:40:28 2009 GMT
Module: packages Tag: HEAD
Log message:
- add patch for bug #48880 random errors with open_basedir(); will be fixed
in 5.3.1
- rel up .3 -> .4
Files affected:
packages/php:
php.spec (1.812 -> 1.813) , php-bug-48880.patch (NONE -> 1.1) (NEW)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.812 packages/php/php.spec:1.813
--- packages/php/php.spec:1.812 Tue Aug 18 12:46:23 2009
+++ packages/php/php.spec Tue Aug 18 19:40:23 2009
@@ -77,7 +77,7 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%definerel 0.3
+%definerel 0.4
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -125,6 +125,7 @@
Patch32: %{name}-m4-divert.patch
Patch38: %{name}-tds.patch
Patch43: %{name}-use-prog_sendmail.patch
+Patch44: %{name}-bug-48880.patch
%if %{with type_hints}
Patch50: http://ilia.ws/patch/type_hint_53_v2.txt
%endif
@@ -1589,6 +1590,8 @@
%patch50 -p0
%endif
+%patch44 -p1
+
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -2725,6 +2728,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.813 2009/08/18 17:40:23 zergin
+- add patch for bug #48880 random errors with open_basedir(); will be fixed
+ in 5.3.1
+- rel up .3 -> .4
+
Revision 1.812 2009/08/18 10:46:23 arekm
- autoconf 2.64 buildfix
Index: packages/php/php-bug-48880.patch
diff -u /dev/null packages/php/php-bug-48880.patch:1.1
--- /dev/null Tue Aug 18 19:40:28 2009
+++ packages/php/php-bug-48880.patchTue Aug 18 19:40:23 2009
@@ -0,0 +1,12 @@
+diff -urN php-5.3.0/main/fopen_wrappers.c mod/main/fopen_wrappers.c
+--- php-5.3.0/main/fopen_wrappers.c2009-06-18 08:38:30.0 +0200
mod/main/fopen_wrappers.c 2009-08-18 18:56:55.647272948 +0200
+@@ -93,7 +93,7 @@
+
+ p = (char **) (base + (size_t) mh_arg1);
+
+- if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN) {
++ if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN
|| stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
+ /* We're in a PHP_INI_SYSTEM context, no restrictions */
+ *p = new_value;
+ return SUCCESS;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.812&r2=1.813&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: spim.spec - more BRs - builds 4 me ;-)
Author: zergin Date: Thu Jan 10 16:34:58 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- more BRs
- builds 4 me ;-)
Files affected:
SPECS:
spim.spec (1.27 -> 1.28)
Diffs:
Index: SPECS/spim.spec
diff -u SPECS/spim.spec:1.27 SPECS/spim.spec:1.28
--- SPECS/spim.spec:1.27Thu Jan 10 17:08:53 2008
+++ SPECS/spim.spec Thu Jan 10 17:34:53 2008
@@ -12,6 +12,8 @@
URL: http://www.cs.wisc.edu/~larus/spim.html
BuildRequires: bison
BuildRequires: flex
+BuildRequires: xorg-cf-files
+BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-util-imake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,7 +57,7 @@
EOF
%{__make} -C spim spim \
- CC="%{__cc} %{rpmcflags}" \
+ CC="%{__cc} %{rpmcflags} -lm" \
LDFLAGS="%{rpmldflags} -lm"
cd xspim
@@ -99,6 +101,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.28 2008-01-10 16:34:53 zergin
+- more BRs
+- builds 4 me ;-)
+
Revision 1.27 2008-01-10 16:08:53 zergin
- fix some BRs
- doesn't build for me on [EMAIL PROTECTED] (some undefined refereneces in C
code)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/spim.spec?r1=1.27&r2=1.28&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: spim.spec - fix some BRs - doesn't build for me on [EMAIL PROTECTED]
Author: zergin Date: Thu Jan 10 16:08:59 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- fix some BRs
- doesn't build for me on [EMAIL PROTECTED] (some undefined refereneces in C
code)
Files affected:
SPECS:
spim.spec (1.26 -> 1.27)
Diffs:
Index: SPECS/spim.spec
diff -u SPECS/spim.spec:1.26 SPECS/spim.spec:1.27
--- SPECS/spim.spec:1.26Mon Feb 12 23:09:15 2007
+++ SPECS/spim.spec Thu Jan 10 17:08:53 2008
@@ -10,7 +10,9 @@
# Source0-md5: 52002170982d157fd89d445b481bd223
Patch0:%{name}-dirs.patch
URL: http://www.cs.wisc.edu/~larus/spim.html
-BuildRequires: imake
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: xorg-util-imake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -97,6 +99,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.27 2008-01-10 16:08:53 zergin
+- fix some BRs
+- doesn't build for me on [EMAIL PROTECTED] (some undefined refereneces in C
code)
+
Revision 1.26 2007-02-12 22:09:15 glen
- tabs in preamble
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/spim.spec?r1=1.26&r2=1.27&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: freenx-server.spec - fix chkconfig complaining about service not sup...
Author: zergin Date: Fri Aug 15 12:20:24 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- fix chkconfig complaining about service not supporting it
(resolves %post, %preun errors)
Files affected:
SPECS:
freenx-server.spec (1.39 -> 1.40)
Diffs:
Index: SPECS/freenx-server.spec
diff -u SPECS/freenx-server.spec:1.39 SPECS/freenx-server.spec:1.40
--- SPECS/freenx-server.spec:1.39 Thu Aug 14 21:03:40 2008
+++ SPECS/freenx-server.specFri Aug 15 14:20:19 2008
@@ -5,7 +5,7 @@
Summary(pl.UTF-8): Darmowa (GPL) imlementacja serwera NX
Name: freenx-server
Version: 0.7.2
-Release: 1.2
+Release: 1.3
License: GPL v2
Group: X11/Applications/Networking
Source0: http://download.berlios.de/freenx/%{name}-%{version}.tar.gz
@@ -123,6 +123,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.40 2008/08/15 12:20:19 zergin
+- fix chkconfig complaining about service not supporting it
+ (resolves %post, %preun errors)
+
Revision 1.39 2008/08/14 19:03:40 aredridel
- not openssl, openssl-tools
- R: xorg-app-sessreg
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freenx-server.spec?r1=1.39&r2=1.40&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: freenx-server.init - fix chkconfig complaining about service not s...
Author: zergin Date: Fri Aug 15 12:20:25 2008 GMT Module: SOURCES Tag: HEAD Log message: - fix chkconfig complaining about service not supporting it (resolves %post, %preun errors) Files affected: SOURCES: freenx-server.init (1.3 -> 1.4) Diffs: Index: SOURCES/freenx-server.init diff -u SOURCES/freenx-server.init:1.3 SOURCES/freenx-server.init:1.4 --- SOURCES/freenx-server.init:1.3 Wed Aug 13 14:13:33 2008 +++ SOURCES/freenx-server.init Fri Aug 15 14:20:19 2008 @@ -1,8 +1,13 @@ #!/bin/sh # -# chkconfig: 345 90 88 -# processname: freenx -# config: /etc/nxserver/node.conf +# freenxfreenx terminal server +# +# chkconfig:345 90 88 +# +# description: freenx terminal server based on NoMachine \ +# technology. +# +# config: /etc/freenx/node.conf # Source function library. . /etc/rc.d/init.d/functions CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/freenx-server.init?r1=1.3&r2=1.4&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: jabber-proxy65.spec - BR: rpm-pythonprov
Author: zergin Date: Sat Sep 6 22:18:03 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- BR: rpm-pythonprov
Files affected:
SPECS:
jabber-proxy65.spec (1.8 -> 1.9)
Diffs:
Index: SPECS/jabber-proxy65.spec
diff -u SPECS/jabber-proxy65.spec:1.8 SPECS/jabber-proxy65.spec:1.9
--- SPECS/jabber-proxy65.spec:1.8 Tue Feb 13 09:06:35 2007
+++ SPECS/jabber-proxy65.spec Sun Sep 7 00:17:58 2008
@@ -10,6 +10,7 @@
# Source0-md5: b2b8a422da099a73d7dfa1305189959e
Requires: python-Twisted
BuildRequires: python-devel
+BuildRequires: rpm-pythonprov
URL: http://proxy65.jabberstudio.org/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,6 +53,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2008/09/06 22:17:58 zergin
+- BR: rpm-pythonprov
+
Revision 1.8 2007/02/13 08:06:35 glen
- tabs in preamble
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jabber-proxy65.spec?r1=1.8&r2=1.9&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: jabberd.spec - up to 2.2.4 - requires gsasl >= 0.2.28 (i've got fa...
Author: zergin Date: Sat Sep 6 22:19:48 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 2.2.4
- requires gsasl >= 0.2.28
(i've got faild to initialize SASL context with lower gsasl)
Files affected:
SPECS:
jabberd.spec (1.107 -> 1.108)
Diffs:
Index: SPECS/jabberd.spec
diff -u SPECS/jabberd.spec:1.107 SPECS/jabberd.spec:1.108
--- SPECS/jabberd.spec:1.107Thu Aug 7 09:59:53 2008
+++ SPECS/jabberd.spec Sun Sep 7 00:19:42 2008
@@ -15,12 +15,12 @@
Summary: Jabber/XMPP server
Summary(pl.UTF-8): Serwer Jabber/XMPP
Name: jabberd
-Version: 2.2.2
+Version: 2.2.4
Release: 0.1
License: GPL
Group: Applications/Communications
Source0:
http://ftp.xiaoka.com/jabberd2/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 807a1be895cebf50f2105ffbb1fcf91b
+# Source0-md5: 91d5bc46063c50da49b81d7b7ea0bbab
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: db-setup.sqlite
@@ -37,7 +37,7 @@
BuildRequires: automake
%{?with_db:BuildRequires: db-devel >= 4.1.24}
BuildRequires: gettext-devel
-BuildRequires: gsasl-devel >= 0.2.26
+BuildRequires: gsasl-devel >= 0.2.28
BuildRequires: libidn-devel >= 0.3.0
BuildRequires: libstdc++-devel
BuildRequires: libtool
@@ -165,6 +165,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.108 2008/09/06 22:19:42 zergin
+- up to 2.2.4
+- requires gsasl >= 0.2.28
+ (i've got faild to initialize SASL context with lower gsasl)
+
Revision 1.107 2008/08/07 07:59:53 pascalek
- updated to 2.2.2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jabberd.spec?r1=1.107&r2=1.108&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: jabberd-2.2.4.tar.bz2
Files fetched: 1 STORED: http://ftp.xiaoka.com/jabberd2/releases/jabberd-2.2.4.tar.bz2 91d5bc46063c50da49b81d7b7ea0bbab jabberd-2.2.4.tar.bz2 Size: 649737 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
DISTFILES: ERROR fetching sources for apache-couchdb.spec ()
cannot cvs get apache-couchdb.spec at -- 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: apache-couchdb/apache-couchdb.spec, apache-couchdb/apache-couchdb...
Author: zergin Date: Mon Nov 2 22:33:28 2009 GMT
Module: packages Tag: HEAD
Log message:
- up to 0.10.0 (not incubating any more)
- add aclocal patch
- builds and packed - dunno if runs
Files affected:
packages/apache-couchdb:
apache-couchdb.spec (1.2 -> 1.3) , apache-couchdb-aclocal.patch (NONE ->
1.1) (NEW)
Diffs:
Index: packages/apache-couchdb/apache-couchdb.spec
diff -u packages/apache-couchdb/apache-couchdb.spec:1.2
packages/apache-couchdb/apache-couchdb.spec:1.3
--- packages/apache-couchdb/apache-couchdb.spec:1.2 Mon Nov 3 13:51:33 2008
+++ packages/apache-couchdb/apache-couchdb.spec Mon Nov 2 23:33:22 2009
@@ -1,17 +1,21 @@
+%define _mochiwebver r97
+%define _ibrowsever 1.5.2
+
# $Revision$, $Date$
Summary: Apache CouchDB
Name: apache-couchdb
-Version: 0.8.1
+Version: 0.10.0
Release: 0.1
License: Apache v2.0
Group: Applications
-Source0:
http://www.apache.org/dist/incubator/couchdb/%{version}-incubating/%{name}-%{version}-incubating.tar.gz
-# Source0-md5: 89e037b370bef33be93f0f317e07615f
+Source0:
http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 227886b5ecbb6bcbbdc538aac4592b0e
Patch0:%{name}-init.d.patch
-URL: http://incubator.apache.org/couchdb/
+Patch1:%{name}-aclocal.patch
+URL: http://couchdb.apache.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6.3
-BuildRequires: erlang >= 1:R11B
+BuildRequires: erlang >= 1:R12B5
BuildRequires: help2man
BuildRequires: js-devel
BuildRequires: libicu-devel
@@ -24,7 +28,7 @@
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: erlang >= 1:R11B
+Requires: erlang >= 1:R12B5
# these came from readme, need to check if these are really needed
#Requires: Mozilla-SpiderMonkey
#Requires: gcc
@@ -43,10 +47,12 @@
the default view definition language.
%prep
-%setup -q -n %{name}-%{version}-incubating
+%setup -q
%patch0 -p1
+%patch1 -p1
%build
+
%{__libtoolize}
%{__aclocal}
%{__autoconf}
@@ -55,6 +61,7 @@
%configure
%{__make}
+
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
@@ -88,7 +95,10 @@
%files
%defattr(644,root,root,755)
%doc AUTHORS BUGS CHANGES NEWS NOTICE README THANKS
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/couch.ini
+%dir %{_sysconfdir}/couchdb/default.d
+%dir %{_sysconfdir}/couchdb/local.d
+%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/couchdb/default.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/local.ini
# XXX -> sysconfdir
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default/couchdb
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/couchdb
@@ -108,20 +118,27 @@
%dir %{_libdir}/couchdb/erlang
%dir %{_libdir}/couchdb/erlang/lib
# XXX: better have unversioned dirs?
-%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating
-%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin/*.beam
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/ebin/*.app
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.beam
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.app
# XXX check if this include is needed runtime
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/include/couch_db.hrl
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/include/couch_db.hrl
# XXX: check if .la is needed
-%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/priv/lib/couch_erl_driver.la
-%attr(755,root,root)
%{_libdir}/couchdb/erlang/lib/couch-%{version}-incubating/priv/lib/couch_erl_driver.so
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/couchspawnkillable
+%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.la
+%attr(755,root,root)
%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.so
+
# XXX: better have unversioned dirs?
-%dir %{_libdir}/couchdb/erlang/lib/mochiweb-r82
-%dir %{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin
-%{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin/*.beam
-%{_libdir}/couchdb/erlang/lib/mochiweb-r82/ebin/*.app
+%dir %{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}
+%dir %{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin
+%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.beam
+%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.app
+
+%{_libdir}/couchdb/erlang/lib/etap/ebin
+%{_libdir}/couchdb/erlang/lib/erlang-oauth/ebin
+%{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}/ebin
+
%{_datadir}/couchdb
%d
DISTFILES: apache-couchdb-0.10.0.tar.gz
Files fetched: 1 STORED: http://www.apache.org/dist/couchdb/0.10.0/apache-couchdb-0.10.0.tar.gz 227886b5ecbb6bcbbdc538aac4592b0e apache-couchdb-0.10.0.tar.gz Size: 850687 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: apache-couchdb/apache-couchdb.spec - provide missing dirs
Author: zergin Date: Wed Nov 4 19:27:45 2009 GMT
Module: packages Tag: HEAD
Log message:
- provide missing dirs
Files affected:
packages/apache-couchdb:
apache-couchdb.spec (1.3 -> 1.4)
Diffs:
Index: packages/apache-couchdb/apache-couchdb.spec
diff -u packages/apache-couchdb/apache-couchdb.spec:1.3
packages/apache-couchdb/apache-couchdb.spec:1.4
--- packages/apache-couchdb/apache-couchdb.spec:1.3 Mon Nov 2 23:33:22 2009
+++ packages/apache-couchdb/apache-couchdb.spec Wed Nov 4 20:27:40 2009
@@ -5,7 +5,7 @@
Summary: Apache CouchDB
Name: apache-couchdb
Version: 0.10.0
-Release: 0.1
+Release: 0.2
License: Apache v2.0
Group: Applications
Source0:
http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
@@ -95,6 +95,7 @@
%files
%defattr(644,root,root,755)
%doc AUTHORS BUGS CHANGES NEWS NOTICE README THANKS
+%dir %{_sysconfdir}/couchdb
%dir %{_sysconfdir}/couchdb/default.d
%dir %{_sysconfdir}/couchdb/local.d
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/couchdb/default.ini
@@ -123,9 +124,14 @@
%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.beam
%{_libdir}/couchdb/erlang/lib/couch-%{version}/ebin/*.app
# XXX check if this include is needed runtime
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}/include
%{_libdir}/couchdb/erlang/lib/couch-%{version}/include/couch_db.hrl
+
# XXX: check if .la is needed
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}/priv
%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/couchspawnkillable
+
+%dir %{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib
%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.la
%attr(755,root,root)
%{_libdir}/couchdb/erlang/lib/couch-%{version}/priv/lib/couch_erl_driver.so
@@ -135,8 +141,13 @@
%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.beam
%{_libdir}/couchdb/erlang/lib/mochiweb-%{_mochiwebver}/ebin/*.app
+%dir %{_libdir}/couchdb/erlang/lib/etap
%{_libdir}/couchdb/erlang/lib/etap/ebin
+
+%dir %{_libdir}/couchdb/erlang/lib/erlang-oauth
%{_libdir}/couchdb/erlang/lib/erlang-oauth/ebin
+
+%dir %{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}
%{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}/ebin
%{_datadir}/couchdb
@@ -147,6 +158,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.4 2009/11/04 19:27:40 zergin
+- provide missing dirs
+
Revision 1.3 2009/11/02 22:33:22 zergin
- up to 0.10.0 (not incubating any more)
- add aclocal patch
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-couchdb/apache-couchdb.spec?r1=1.3&r2=1.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: apache-couchdb/apache-couchdb.spec, apache-couchdb/apache-couchdb...
Author: zergin Date: Thu Nov 26 15:25:40 2009 GMT
Module: packages Tag: HEAD
Log message:
- Provide our own init script (too much changes to patch orginal(?))
- Cleanups in %files (duplicates)
Files affected:
packages/apache-couchdb:
apache-couchdb.spec (1.4 -> 1.5) , apache-couchdb.init (NONE -> 1.1) (NEW)
Diffs:
Index: packages/apache-couchdb/apache-couchdb.spec
diff -u packages/apache-couchdb/apache-couchdb.spec:1.4
packages/apache-couchdb/apache-couchdb.spec:1.5
--- packages/apache-couchdb/apache-couchdb.spec:1.4 Wed Nov 4 20:27:40 2009
+++ packages/apache-couchdb/apache-couchdb.spec Thu Nov 26 16:25:35 2009
@@ -5,13 +5,13 @@
Summary: Apache CouchDB
Name: apache-couchdb
Version: 0.10.0
-Release: 0.2
+Release: 0.3
License: Apache v2.0
Group: Applications
Source0:
http://www.apache.org/dist/couchdb/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 227886b5ecbb6bcbbdc538aac4592b0e
-Patch0:%{name}-init.d.patch
-Patch1:%{name}-aclocal.patch
+Source1: %{name}.init
+Patch0:%{name}-aclocal.patch
URL: http://couchdb.apache.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6.3
@@ -29,6 +29,8 @@
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
Requires: erlang >= 1:R12B5
+Requires: libicu-devel
+Requires: pkgconfig
# these came from readme, need to check if these are really needed
#Requires: Mozilla-SpiderMonkey
#Requires: gcc
@@ -49,7 +51,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
@@ -68,6 +69,13 @@
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/couchdb
+install -d $RPM_BUILD_ROOT/var/log/couchdb
+
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+mv $RPM_BUILD_ROOT/etc/default/couchdb $RPM_BUILD_ROOT/etc/sysconfig
+
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/couchdb
%clean
rm -rf $RPM_BUILD_ROOT
@@ -97,14 +105,18 @@
%doc AUTHORS BUGS CHANGES NEWS NOTICE README THANKS
%dir %{_sysconfdir}/couchdb
%dir %{_sysconfdir}/couchdb/default.d
-%dir %{_sysconfdir}/couchdb/local.d
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/couchdb/default.ini
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/couchdb/local.ini
+%attr(755,couchdb,couchdb) %{_sysconfdir}/couchdb/default.d
+%attr(755,couchdb,couchdb) %dir %{_sysconfdir}/couchdb/local.d
+%attr(644,couchdb,couchdb) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/couchdb/default.ini
+%attr(644,couchdb,couchdb) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/couchdb/local.ini
# XXX -> sysconfdir
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/default/couchdb
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/couchdb
%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/couchdb
%attr(754,root,root) /etc/rc.d/init.d/couchdb
+%dir /var/log/couchdb
+%attr(755,couchdb,couchdb) /var/log/couchdb
+
# XXX: sbindir?
%attr(755,root,root) %{_bindir}/couchdb
%attr(755,root,root) %{_bindir}/couchjs
@@ -150,7 +162,7 @@
%dir %{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}
%{_libdir}/couchdb/erlang/lib/ibrowse-%{_ibrowsever}/ebin
-%{_datadir}/couchdb
+%attr(755,couchdb,couchdb) %{_datadir}/couchdb
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -158,6 +170,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.5 2009/11/26 15:25:35 zergin
+- Provide our own init script (too much changes to patch orginal(?))
+- Cleanups in %files (duplicates)
+
Revision 1.4 2009/11/04 19:27:40 zergin
- provide missing dirs
Index: packages/apache-couchdb/apache-couchdb.init
diff -u /dev/null packages/apache-couchdb/apache-couchdb.init:1.1
--- /dev/null Thu Nov 26 16:25:40 2009
+++ packages/apache-couchdb/apache-couchdb.init Thu Nov 26 16:25:35 2009
@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+# couchdb Starts CouchDB
+#
+# chkconfig: 2345 84 25
+# description: Apache CouchDB init script
+# pidfile: /var/run/couchdb.pid
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# defaults
+COUCHDB=/usr/bin/couchdb
+RUN_DIR=/var/run/couchdb
+COUCHDB_USER=root
+
+# Get service config
+if [ -f /etc/sysconfig/couchdb ]; then
+ . /etc/sysconfig/couchdb
+fi
+
+
+start() {
+ # Check if the service is already running?
+ if [ ! -f /var/lock/subsys/couchdb ]; then
+ msg_starting "CouchDB"
+
+ command="$COUCHDB -b -p /var/run/couchdb.pid"
+ #command="$COUCHDB"
+ if test -n "$COUCHDB_STDOUT_FILE
DISTFILES: PHPUnit-3.3.14.tgz
Files fetched: 1 STORED: http://pear.phpunit.de/get/PHPUnit-3.3.14.tgz c2c17862f15df871f122f33be9919c5b PHPUnit-3.3.14.tgz Size: 271938 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
SPECS: php-PHPUnit.spec - update to 3.3.14 (current stable)
Author: zergin Date: Tue Feb 24 13:26:56 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- update to 3.3.14 (current stable)
Files affected:
SPECS:
php-PHPUnit.spec (1.6 -> 1.7)
Diffs:
Index: SPECS/php-PHPUnit.spec
diff -u SPECS/php-PHPUnit.spec:1.6 SPECS/php-PHPUnit.spec:1.7
--- SPECS/php-PHPUnit.spec:1.6 Sun Dec 21 22:29:06 2008
+++ SPECS/php-PHPUnit.spec Tue Feb 24 14:26:50 2009
@@ -6,12 +6,12 @@
Summary: %{_pearname} - regression testing framework for unit tests
Summary(pl.UTF-8): %{_pearname} - zestaw testów regresyjnych
Name: php-%{_pearname}
-Version: 3.3.8
+Version: 3.3.14
Release: 1
License: BSD
Group: Development/Languages/PHP
Source0: http://pear.phpunit.de/get/PHPUnit-%{version}.tgz
-# Source0-md5: a6ff94e0c8b485448092f43c7ffa0bf9
+# Source0-md5: c2c17862f15df871f122f33be9919c5b
URL: http://www.phpunit.de/
BuildRequires: php-pear >= 4:1.1-2
BuildRequires: php-pear-PEAR
@@ -80,6 +80,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.7 2009/02/24 13:26:50 zergin
+- update to 3.3.14 (current stable)
+
Revision 1.6 2008/12/21 21:29:06 glen
- update to 3.3.8
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-PHPUnit.spec?r1=1.6&r2=1.7&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: php-PHPUnit.spec - add missing /usr/bin/phpunit (rel 2)
Author: zergin Date: Tue Feb 24 15:07:53 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- add missing /usr/bin/phpunit (rel 2)
Files affected:
SPECS:
php-PHPUnit.spec (1.7 -> 1.8)
Diffs:
Index: SPECS/php-PHPUnit.spec
diff -u SPECS/php-PHPUnit.spec:1.7 SPECS/php-PHPUnit.spec:1.8
--- SPECS/php-PHPUnit.spec:1.7 Tue Feb 24 14:26:50 2009
+++ SPECS/php-PHPUnit.spec Tue Feb 24 16:07:47 2009
@@ -7,7 +7,7 @@
Summary(pl.UTF-8): %{_pearname} - zestaw testów regresyjnych
Name: php-%{_pearname}
Version: 3.3.14
-Release: 1
+Release: 2
License: BSD
Group: Development/Languages/PHP
Source0: http://pear.phpunit.de/get/PHPUnit-%{version}.tgz
@@ -59,6 +59,8 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{php_pear_dir}
+install -d $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/phpunit $RPM_BUILD_ROOT%{_bindir}
%pear_package_install
%clean
@@ -69,6 +71,7 @@
%doc install.log optional-packages.txt
%{php_pear_dir}/.registry/.channel.pear.phpunit.de/*.reg
%{php_pear_dir}/%{_class}
+%attr(755,root,root) %{_bindir}/phpunit
%files tests
%defattr(644,root,root,755)
@@ -80,6 +83,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.8 2009/02/24 15:07:47 zergin
+- add missing /usr/bin/phpunit (rel 2)
+
Revision 1.7 2009/02/24 13:26:50 zergin
- update to 3.3.14 (current stable)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-PHPUnit.spec?r1=1.7&r2=1.8&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - update to snap 2009.02.24 15:30 (beta2 status) - ...
Author: zergin Date: Tue Feb 24 18:21:56 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- update to snap 2009.02.24 15:30 (beta2 status)
- update zend_module_api to 20090115
- update zend_extension_api to 220090115
- remove unrecognized configure options:
--with-apache-version, --enable-memory-limit, --with-inifile,
--with-flatfile, --enable-gd-jus-conf, --enable-track-vars,
--enable-trans-sid, --with-expat-dir, --without-sablot-js,
--with-tiff-dir
--enable-reflection
--enable-fastcgi, --with-fastcgi, --enable-force-cgi-redirect
(fastcgi and reflection are always enabled)
- drop gcc2 patch (gcc2 and php 5.3? please... and it would require maintaing
php 5.3+ branch as it doesn't apply to current sources)
- drop hardening patch and bcond: unavailable for php 5.3 and dropped on MAIN
- drop versioning patch and bcond: unmaintained
- preserve ORACLE_HOME env var if oci8 bcond is on (from MAIN)
- add php-use-prog_sendmail.patch (from MAIN)
- still doesn't build with sybase_ct
Files affected:
SPECS:
php.spec (1.688.2.19 -> 1.688.2.20)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.19 SPECS/php.spec:1.688.2.20
--- SPECS/php.spec:1.688.2.19 Mon Dec 29 20:52:27 2008
+++ SPECS/php.spec Tue Feb 24 19:21:50 2009
@@ -17,7 +17,6 @@
#
# Conditional build:
%bcond_withfdf # with FDF (PDF forms) module (BR:
proprietary lib)
-%bcond_withhardening # build with hardening patch applied
(http://www.hardened-php.net/)
%bcond_withinterbase_inst # use InterBase install., not Firebird (BR:
proprietary libs)
%bcond_withoci8# with Oracle oci8 extension module (BR:
proprietary libs)
%bcond_without curl# without CURL extension module
@@ -45,7 +44,6 @@
%bcond_without fcgi# disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
%bcond_withtests # default off; test process very often hangs on
buildersl; perform "make test"
-%bcond_withversioning # build with experimental versioning (to load
php4/php5 into same apache)
%define apxs1 /usr/sbin/apxs1
%defineapxs2 /usr/sbin/apxs
@@ -65,7 +63,7 @@
%endif
%define_rel0.18
-%define_snap 200812271530
+%define_snap 200902241530
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -74,20 +72,18 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
Version: 5.3
-Release: %{_rel}%{?with_hardening:harden...@%{_snap}
+Release: %{_r...@%{_snap}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: 5af2615d3f9547157138a713cf7bab7c
+# Source0-md5: 8ac3a7ca1f401a95893d764e536efb77
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
Source5: %{name}-cgi.ini
Source6: %{name}-apache.ini
Source7: %{name}-cli.ini
-Source8: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz
-# Source8-md5: 47a742fa9fab2826ad10c13a2376111a
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
Patch0:%{name}-shared.patch
@@ -102,7 +98,6 @@
Patch10: %{name}-ini.patch
# XXX: needs fix
Patch12: %{name}-threads-acfix.patch
-Patch13: %{name}-tsrmlsfetchgcc2.patch
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
Patch17: %{name}-readline.patch
@@ -110,14 +105,13 @@
Patch19: %{name}-gd_imagerotate_enable.patch
Patch20: %{name}-uint32_t.patch
Patch21: %{name}-dba-link.patch
-Patch22: %{name}-hardening-fix.patch
Patch23: %{name}-both-apxs.patch
Patch24: %{name}-builddir.patch
Patch25: %{name}-zlib-for-getimagesize.patch
-Patch26: %{name}-versioning.patch
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
Patch38: %{name}-tds.patch
+Patch43: %{name}-use-prog_sendmail.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
@@ -193,10 +187,15 @@
# must be in sync with source. extra check ensuring that it is so is done in
%%build
%definephp_api_version 20041225
-%definezend_module_api 20071006
-%definezend_extension_api 220070929
-%definezend_zts
%{!?with_zts:0}%{?with_zts:1}
-%definephp_debug %{!?de
DISTFILES: php5.3-200902241530.tar.bz2
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200902241530.tar.bz2 8ac3a7ca1f401a95893d764e536efb77 php5.3-200902241530.tar.bz2 Size: 10925379 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
DISTFILES: spidermonkey-0.1.2.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/spidermonkey-0.1.2.tgz 7f10434a77be984b2f7cfba7ff031413 spidermonkey-0.1.2.tgz Size: 14367 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
SPECS: php-pecl-spidermonkey.spec (NEW) - New: spec file for SpiderMonkey P...
Author: zergin Date: Sat Mar 14 14:28:18 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- New: spec file for SpiderMonkey PECL extension
Files affected:
SPECS:
php-pecl-spidermonkey.spec (NONE -> 1.1) (NEW)
Diffs:
Index: SPECS/php-pecl-spidermonkey.spec
diff -u /dev/null SPECS/php-pecl-spidermonkey.spec:1.1
--- /dev/null Sat Mar 14 15:28:18 2009
+++ SPECS/php-pecl-spidermonkey.specSat Mar 14 15:28:13 2009
@@ -0,0 +1,88 @@
+# $Revision$, $Date$
+%define_modnamespidermonkey
+%define_status beta
+Summary: %{_modname} - UUID support functions
+Summary(pl.UTF-8): %{_modname} - funkcje obsługujące UUID
+Name: php-pecl-%{_modname}
+Version: 0.1.2
+Release: 1
+License: PHP 2.02
+Group: Development/Languages/PHP
+Source0: http://pecl.php.net/get/%{_modname}-%{version}.tgz
+# Source0-md5: 7f10434a77be984b2f7cfba7ff031413
+URL: http://pecl.php.net/package/%{_modname}/
+BuildRequires: js-devel
+BuildRequires: php-devel >= 3:5.3.0
+BuildRequires: rpmbuild(macros) >= 1.344
+%{?requires_php_extension}
+Requires: php-common >= 4:5.3.0
+Obsoletes: php-pear-%{_modname}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This extension allow you to embed Mozilla's Javascript engine
+Spidermonkey in PHP.
+
+In PECL status of this package is: %{_status}.
+
+%description -l pl.UTF-8
+To rozszerzenie pozwala na osadzanie w PHP silnika Javascript Mozilli
+- Spidermonkey.
+
+To rozszerzenie ma w PECL status: %{_status}.
+
+%prep
+%setup -q -c
+
+%build
+cd %{_modname}-%{version}
+
+# libtool 2.2 build fix
+if [ -f '%{_aclocaldir}/ltsugar.m4' ]; then
+ cat "%{_aclocaldir}/ltsugar.m4" >> "config.m4"
+ cat "%{_aclocaldir}/ltversion.m4" >> "config.m4"
+ cat "%{_aclocaldir}/lt~obsolete.m4" >> "config.m4"
+ cat "%{_aclocaldir}/ltoptions.m4" >> "config.m4"
+fi
+
+phpize
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
+
+install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
+; Enable %{_modname} extension module
+extension=%{_modname}.so
+EOF
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%php_webserver_restart
+
+%postun
+if [ "$1" = 0 ]; then
+ %php_webserver_restart
+fi
+
+%files
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team
+All persons listed below can be reached at @pld-linux.org
+
+$Log$
+Revision 1.1 2009/03/14 14:28:13 zergin
+- New: spec file for SpiderMonkey PECL extension
+
+Revision 1.21 2008/10/14 22:29:13 baggins
+- up to 1.0.2
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - up snap to 200903141330 - change package version ...
Author: zergin Date: Sat Mar 14 17:21:20 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- up snap to 200903141330
- change package version from 5.3 -> 5.3.0
Files affected:
SPECS:
php.spec (1.688.2.20 -> 1.688.2.21)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.20 SPECS/php.spec:1.688.2.21
--- SPECS/php.spec:1.688.2.20 Tue Feb 24 19:21:50 2009
+++ SPECS/php.spec Sat Mar 14 18:21:13 2009
@@ -63,7 +63,7 @@
%endif
%define_rel0.18
-%define_snap 200902241530
+%define_snap 200903141330
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -71,13 +71,13 @@
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов,
выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
-Version: 5.3
+Version: 5.3.0
Release: %{_r...@%{_snap}
Epoch: 4
License: PHP
Group: Libraries
-Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: 8ac3a7ca1f401a95893d764e536efb77
+Source0: http://snaps.php.net/%{name}5.3-%{_snap}.tar.bz2
+# Source0-md5: 1c090604bc8f3bd0a20db98896402671
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
@@ -1462,7 +1462,7 @@
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q -n %{name}%{version}-%{_snap}
+%setup -q -n %{name}5.3-%{_snap}
%patch0 -p1
%patch1 -p1
#%patch2 -p1
@@ -2571,6 +2571,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.688.2.21 2009/03/14 17:21:13 zergin
+- up snap to 200903141330
+- change package version from 5.3 -> 5.3.0
+
Revision 1.688.2.20 2009/02/24 18:21:50 zergin
- update to snap 2009.02.24 15:30 (beta2 status)
- update zend_module_api to 20090115
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.20&r2=1.688.2.21&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php5.3-200903141330.tar.bz2
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200903141330.tar.bz2 1c090604bc8f3bd0a20db98896402671 php5.3-200903141330.tar.bz2 Size: 10930680 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
SPECS (DEVEL): php.spec - up to 2009040101 (post RC1) - unify CGI and Fast...
Author: zergin Date: Wed Apr 1 15:27:04 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- up to 2009040101 (post RC1)
- unify CGI and FastCGI packages
This AIN'T tested for smooth updates yet.
- drop php-fcgi
- php-cgi provides php(fcgi)
- php-cgi obsoletes php-fcgi
- php-cgi has symlink php.cgi -> php.fcgi
- use "new ini files"
- php.ini-production as new base config
- full copies for sapi configs
cofiguration isn't merged with base php.ini
- package .phpt unit tests and run-tests.php script into
new php-tests package
Files affected:
SPECS:
php.spec (1.688.2.27 -> 1.688.2.28)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.27 SPECS/php.spec:1.688.2.28
--- SPECS/php.spec:1.688.2.27 Tue Mar 17 10:08:14 2009
+++ SPECS/php.spec Wed Apr 1 17:26:57 2009
@@ -11,7 +11,6 @@
# dbase, mhash, mime_magic, ming, ncurses, sybase
# - make additional headers and checking added by mail patch configurable
# - modularize session, standard (output from pure php -m)?
-# - sapi/cgi has fastcgi always built in, ie -fcgi and -cgi packages are the
same
# - lib64 patch obsolete by $PHP_LIBDIR ?
# - php-sapi-ini-file.patch broken? (/etc/php/cli.d not read for php-cli!)
# - move mysqlnd out of libphp-common.so?
@@ -57,7 +56,6 @@
%bcond_without xmlrpc # without XML-RPC extension module
%bcond_without apache1 # disable building apache 1.3.x module
%bcond_without apache2 # disable building apache 2.x module
-%bcond_without fcgi# disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
%bcond_withtests # default off; test process very often hangs on
buildersl; perform "make test"
@@ -78,8 +76,8 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%definerel 0.28
-%definesnap200903170730
+%definerel 0.29
+%definesnap200904010630
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -93,12 +91,8 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}5.3-%{snap}.tar.bz2
-# Source0-md5: 81d73b78769a0731b98ce8218e817313
+# Source0-md5: 1e4406a94afedb816f4faf4de12c4798
Source3: %{name}-mod_%{name}.conf
-Source4: %{name}-cgi-fcgi.ini
-Source5: %{name}-cgi.ini
-Source6: %{name}-apache.ini
-Source7: %{name}-cli.ini
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
Patch0:%{name}-shared.patch
@@ -110,7 +104,6 @@
Patch6:%{name}-build_modules.patch
Patch7:%{name}-sapi-ini-file.patch
Patch9:%{name}-sh.patch
-Patch10: %{name}-ini.patch
Patch12: %{name}-threads-acfix.patch
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
@@ -140,7 +133,7 @@
%if %{with xmlrpc}
BuildRequires: expat-devel
%endif
-%{?with_fcgi:BuildRequires:fcgi-devel}
+Requires: fcgi-devel
%{?with_fdf:BuildRequires: fdftk-devel}
BuildRequires: flex
%if %{with mssql} || %{with sybase_ct}
@@ -300,31 +293,20 @@
%description -n apache-mod_php -l pl.UTF-8
php jako moduł DSO (Dynamic Shared Object) dla apache 2.x.
-%package fcgi
-Summary: php as FastCGI program
-Summary(pl.UTF-8): php jako program FastCGI
-Group: Development/Languages/PHP
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Provides: webserver(php) = %{version}
-
-%description fcgi
-php as FastCGI program.
-
-%description fcgi -l pl.UTF-8
-php jako program FastCGI.
-
%package cgi
Summary: php as CGI program
Summary(pl.UTF-8): php jako program CGI
Group: Development/Languages/PHP
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(cgi)
+Provides: php(fcgi)
+Obsoletes: php-fcgi
%description cgi
-php as CGI program.
+php as CGI or FastCGI program.
%description cgi -l pl.UTF-8
-php jako program CGI.
+php jako program CGI lub FastCGI.
%package cli
Summary: php as CLI interpreter
@@ -1384,6 +1366,19 @@
%description sysvshm -l pl.UTF-8
Moduł PHP umożliwiający korzystanie z pamięci dzielonej SysV.
+%package tests
+Summary: Contains unit test files for PHP and extensions
+Summary(pl.UTF-8): Zawiera pliki testów jednostkowych dla PHP i rozszerzeń
+Group: Libraries
+URL: http://qa.php.net/
+Requires: %{name}-cli
+
+%description tests
+This package contains unit tests for PHP and it's extensions.
+
+%description tests -l pl.UTF-8
+Ten pakiet zawiera pliki testów jednostkowych dla PHP i rozszer
DISTFILES: php5.3-200904010630.tar.bz2
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200904010630.tar.bz2 1e4406a94afedb816f4faf4de12c4798 php5.3-200904010630.tar.bz2 Size: 10998186 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
SOURCES (DEVEL): php-uint32_t.patch - adapt to current 5.3 snap
Author: zergin Date: Wed Apr 1 17:47:16 2009 GMT Module: SOURCES Tag: DEVEL Log message: - adapt to current 5.3 snap Files affected: SOURCES: php-uint32_t.patch (1.2.4.1 -> 1.2.4.2) Diffs: Index: SOURCES/php-uint32_t.patch diff -u SOURCES/php-uint32_t.patch:1.2.4.1 SOURCES/php-uint32_t.patch:1.2.4.2 --- SOURCES/php-uint32_t.patch:1.2.4.1 Mon Dec 29 21:11:46 2008 +++ SOURCES/php-uint32_t.patch Wed Apr 1 19:47:10 2009 @@ -1,11 +1,11 @@ -diff -ur php5.3-200812262130/Zend/zend_strtod.c mod/Zend/zend_strtod.c php5.3-200812262130/Zend/zend_strtod.c 2008-12-02 18:36:12.0 +0100 -+++ mod/Zend/zend_strtod.c 2008-12-27 01:28:47.0 +0100 +diff -ur php5.3-200903291030/Zend/zend_strtod.c mod/Zend/zend_strtod.c +--- php5.3-200903291030/Zend/zend_strtod.c 2009-03-18 12:36:20.0 +0100 mod/Zend/zend_strtod.c 2009-03-29 18:34:10.0 +0200 @@ -93,6 +93,7 @@ #include #include +#include - #include #ifdef ZTS + #include CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-uint32_t.patch?r1=1.2.4.1&r2=1.2.4.2&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): php.spec - php-cgi Provides: webserver(php) as php-fcgi used...
Author: zergin Date: Wed Apr 15 23:50:22 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- php-cgi Provides: webserver(php) as php-fcgi used to
- new snap 200904152030
Files affected:
SPECS:
php.spec (1.688.2.28 -> 1.688.2.29)
Diffs:
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.28 SPECS/php.spec:1.688.2.29
--- SPECS/php.spec:1.688.2.28 Wed Apr 1 17:26:57 2009
+++ SPECS/php.spec Thu Apr 16 01:50:14 2009
@@ -77,7 +77,7 @@
%endif
%definerel 0.29
-%definesnap200904010630
+%definesnap200904152030
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -91,7 +91,7 @@
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}5.3-%{snap}.tar.bz2
-# Source0-md5: 1e4406a94afedb816f4faf4de12c4798
+# Source0-md5: 643edcf615d4d7423b5d709ad6ea670d
Source3: %{name}-mod_%{name}.conf
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
@@ -300,6 +300,7 @@
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: php(cgi)
Provides: php(fcgi)
+Provides: webserver(php)
Obsoletes: php-fcgi
%description cgi
@@ -2597,7 +2598,7 @@
%defattr(644,root,root,755)
%dir /usr/share/php/tests
/usr/share/php/tests/quicktester.inc
-/usr/share/php/tests/run-tests.php
+%attr(755,root,root) /usr/share/php/tests/run-tests.php
%dir /usr/share/php/tests/basic
/usr/share/php/tests/basic/*
@@ -2685,6 +2686,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.688.2.29 2009/04/15 23:50:14 zergin
+- php-cgi Provides: webserver(php) as php-fcgi used to
+- new snap 200904152030
+
Revision 1.688.2.28 2009/04/01 15:26:57 zergin
- up to 2009040101 (post RC1)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.28&r2=1.688.2.29&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: php5.3-200904152030.tar.bz2
Files fetched: 1 STORED: http://snaps.php.net/php5.3-200904152030.tar.bz2 643edcf615d4d7423b5d709ad6ea670d php5.3-200904152030.tar.bz2 Size: 11035924 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
SOURCES: mpt-status-sync_info.patch (NEW) - add --sync_info option...
Author: zergin Date: Sat Mar 22 21:01:28 2008 GMT
Module: SOURCES Tag: HEAD
Log message:
- add --sync_info option to mpt-status (patch)
returns more info about array resynchronization process, provides data
about: resync rate (MiB/s), resync data (done/total, left) and ETA
TESTED ONLY ON MY SYSTEM: x86_64 with 3442E-R HBA
- up rel 1 -> 2
Files affected:
SOURCES:
mpt-status-sync_info.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/mpt-status-sync_info.patch
diff -u /dev/null SOURCES/mpt-status-sync_info.patch:1.1
--- /dev/null Sat Mar 22 22:01:28 2008
+++ SOURCES/mpt-status-sync_info.patch Sat Mar 22 22:01:23 2008
@@ -0,0 +1,240 @@
+Only in mod/: .mpt-status.c~
+Only in mod/: .mpt-status.h~
+diff -ur orig/mpt-status.c mod/mpt-status.c
+--- orig/mpt-status.c 2006-11-01 09:13:35.0 +
mod/mpt-status.c 2008-03-22 20:31:56.546110535 +
+@@ -38,6 +38,7 @@
+ #include "mpt-status.h"
+
+ #define ARG_M_A 0x0001
++#define ARG_M_S 0x0002
+
+ static int m = 0;
+ static int quiet_mode = 0;
+@@ -52,6 +53,7 @@
+ static int ioc_unit = 0;
+ static int newstyle = 0;
+ static int sync_state[2] = { 0, 0 };
++static int sync_info = 0;
+
+ static int sel;
+ static const struct option long_options[] = {
+@@ -64,6 +66,7 @@
+ { "quiet", no_argument, NULL, 'q' },
+ { "set_id", required_argument, NULL, 'i' },
+ { "status_only",no_argument, NULL, 's' },
++ { "sync_info", no_argument, &sel, ARG_M_S },
+ { "verbose",no_argument, NULL, 'v' },
+ { "version",no_argument, NULL, 'V' },
+ { 0,no_argument, NULL, 0 },
+@@ -85,6 +88,8 @@
+ " -i, --set_id Set id of primary device (check README)\n"
+ " -s, --status_only Only print the status information. This can\n"
+ " be used for easy scripting\n"
++ " --sync_infoShow RAID (re)synchronization information\n"
++ " (subject to quite mode setting)\n"
+ " -u, --controller Set the IOC unit (controller)\n"
+ " -v, --verbose Print verbose information, such as warnings\n"
+ " -V, --version Print version information\n"
+@@ -124,6 +129,7 @@
+ static void GetHotSpareInfo(void);
+ static void GetResyncPercentageSilent(RaidVol0PhysDisk_t *, unsigned char *,
int);
+ static void GetResyncPercentage(RaidVol0PhysDisk_t *, unsigned char *, int);
++static void GetSyncInfo(void);
+ static void do_init(void);
+ /* internal-functions declaration */
+ static void __check_endianess(void);
+@@ -131,6 +137,7 @@
+ static void __print_volume_classic(RaidVolumePage0_t *);
+ static void __print_physdisk_advanced(RaidPhysDiskPage0_t *, int);
+ static void __print_physdisk_classic(RaidPhysDiskPage0_t *);
++static SyncInfoData __get_resync_data(void);
+
+ static void __check_endianess(void) {
+ int i = 1;
+@@ -770,6 +777,138 @@
+ return;
+ }
+
++/* get resync data for volume 0 only */
++static SyncInfoData __get_resync_data(void) {
++ SyncInfoData data = { -1, -1, -1 };
++ MpiRaidActionRequest_t *pRequest;
++ unsigned int numBytes;
++
++ // get size for structure
++ numBytes = (sizeof(Config_t) - sizeof(SGE_IO_UNION)) +
sizeof(SGESimple64_t);
++
++ // get mpi block pointer
++ if ((mpiBlkPtr = allocIoctlBlk(numBytes)) == NULL ) return data;
++
++ // set Sge offset (dunno)
++ mpiBlkPtr->dataSgeOffset = (sizeof (MpiRaidActionRequest_t) -
sizeof(SGE_IO_UNION))/4;
++
++ /* Initialize data in/data out sizes: Change below if need to */
++ mpiBlkPtr->dataInSize = mpiBlkPtr->dataOutSize = 0;
++
++ // prepare request call
++ pRequest = (MpiRaidActionRequest_t *) mpiBlkPtr->MF;
++ pRequest->Action = MPI_RAID_ACTION_INDICATOR_STRUCT;
++ pRequest->Function = MPI_FUNCTION_RAID_ACTION;
++ pRequest->MsgContext = -1;
++ pRequest->ActionDataWord = 0; /* action data is 0 */
++
++ // if status is ok - read total and remaining blocks
++ if(read_page2(MPT_FLAGS_KEEP_MEM)==0) {
++ uint *pdata = (uint *) mpiBlkPtr->replyFrameBufPtr;
++
++ // populate data structure - total blocks
++ pdata += 6;
++ data.blocks_total = *pdata;
++
++ // populate data structure - left blocks
++ pdata += 2;
++ data.blocks_left = *pdata;
++
++ // populate data structure - done blocks
SPECS: mpt-status.spec - add --sync_info option to mpt-status (pat...
Author: zergin Date: Sat Mar 22 21:01:29 2008 GMT
Module: SPECS Tag: HEAD
Log message:
- add --sync_info option to mpt-status (patch)
returns more info about array resynchronization process, provides data
about: resync rate (MiB/s), resync data (done/total, left) and ETA
TESTED ONLY ON MY SYSTEM: x86_64 with 3442E-R HBA
- up rel 1 -> 2
Files affected:
SPECS:
mpt-status.spec (1.8 -> 1.9)
Diffs:
Index: SPECS/mpt-status.spec
diff -u SPECS/mpt-status.spec:1.8 SPECS/mpt-status.spec:1.9
--- SPECS/mpt-status.spec:1.8 Mon Mar 10 16:59:19 2008
+++ SPECS/mpt-status.spec Sat Mar 22 22:01:23 2008
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Program podający stan kontrolera LSI 1030 RAID
Name: mpt-status
Version: 1.2.0
-Release: 1
+Release: 2
License: GPL v2+
Group: Applications/System
Source0:
http://www.drugphish.ch/~ratz/mpt-status/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@
# needed headers taken from kernel 2.6.16.29 source
Patch0:%{name}-headers.patch
Patch1:%{name}-no_compiler.h.patch
+Patch2:%{name}-sync_info.patch
URL: http://www.red-bean.com/~mab/mpt-status.html
BuildRequires: pciutils-devel
Requires: dev >= 2.9.0-20
@@ -26,6 +27,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__make} \
@@ -55,6 +57,15 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2008-03-22 21:01:23 zergin
+- add --sync_info option to mpt-status (patch)
+ returns more info about array resynchronization process, provides data
+ about: resync rate (MiB/s), resync data (done/total, left) and ETA
+
+ TESTED ONLY ON MY SYSTEM: x86_64 with 3442E-R HBA
+
+- up rel 1 -> 2
+
Revision 1.8 2008-03-10 15:59:19 zbyniu
- - there is no compiler.h in current llh, in old was empty
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mpt-status.spec?r1=1.8&r2=1.9&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: mpt-status-sync_info.patch - fix progress bar
Author: zergin Date: Sat Mar 22 22:14:40 2008 GMT
Module: SOURCES Tag: HEAD
Log message:
- fix progress bar
Files affected:
SOURCES:
mpt-status-sync_info.patch (1.2 -> 1.3)
Diffs:
Index: SOURCES/mpt-status-sync_info.patch
diff -u SOURCES/mpt-status-sync_info.patch:1.2
SOURCES/mpt-status-sync_info.patch:1.3
--- SOURCES/mpt-status-sync_info.patch:1.2 Sat Mar 22 22:06:18 2008
+++ SOURCES/mpt-status-sync_info.patch Sat Mar 22 23:14:35 2008
@@ -1,6 +1,6 @@
diff -ur orig/mpt-status.c mod/mpt-status.c
--- orig/mpt-status.c 2006-11-01 09:13:35.0 +
-+++ mod/mpt-status.c 2008-03-22 20:31:56.546110535 +
mod/mpt-status.c 2008-03-22 21:58:45.749101474 +
@@ -38,6 +38,7 @@
#include "mpt-status.h"
@@ -50,7 +50,7 @@
static void __check_endianess(void) {
int i = 1;
-@@ -770,6 +777,138 @@
+@@ -770,6 +777,140 @@
return;
}
@@ -144,9 +144,11 @@
+ time[2] = time[3]-(3600*time[0])-(60*time[1]);
// s
+
+ // set progress bar...
-+ for(i = 1; i < percent/2; i++)
-+ progress[i] = '=';
-+ progress[i-1] = '>';
++ for(i = 1; i < percent/2; i++)
++ progress[i] = '=';
++
++ if(i==1) progress[i] = '>';
++ else progress[--i] = '>';
+
+ // if in quite_mode: only print resync status
+ if(quiet_mode>0) {
@@ -189,7 +191,7 @@
static void __print_volume_advanced(RaidVolumePage0_t *page) {
if (1 == print_status_only) {
mpt_printf("vol_id:%d", page->VolumeID);
-@@ -1164,9 +1303,9 @@
+@@ -1164,9 +1305,9 @@
mpt_exit(MPT_EXIT_OKAY);
break;
case 0:
@@ -202,7 +204,7 @@
break;
case -1:
// Done with options
-@@ -1192,7 +1331,6 @@
+@@ -1192,7 +1333,6 @@
mpt_exit(MPT_EXIT_UNKNOWN);
}
*/
@@ -210,7 +212,7 @@
} else {
/* this is the old style setup */
if (probe_id > 0) {
-@@ -1208,7 +1346,10 @@
+@@ -1208,7 +1348,10 @@
mpt_exit(MPT_EXIT_OKAY);
}
}
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mpt-status-sync_info.patch?r1=1.2&r2=1.3&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: htscanner-0.8.1.tgz
Files fetched: 1 STORED: http://pecl.php.net/get/htscanner-0.8.1.tgz 8d3a4a63639c380b9268717a9a28dabe htscanner-0.8.1.tgz Size: 8608 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
SPECS: php-htscanner.spec - updated to 0.8.1 - added all configure...
Author: zergin Date: Sat Sep 1 16:57:54 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 0.8.1
- added all configure options to generated htscanner.ini file
- dropped path0
Files affected:
SPECS:
php-htscanner.spec (1.8 -> 1.9)
Diffs:
Index: SPECS/php-htscanner.spec
diff -u SPECS/php-htscanner.spec:1.8 SPECS/php-htscanner.spec:1.9
--- SPECS/php-htscanner.spec:1.8Tue Feb 13 09:06:39 2007
+++ SPECS/php-htscanner.specSat Sep 1 18:57:49 2007
@@ -3,14 +3,13 @@
Summary: PHP Module to emulate .htaccess support in PHP engine
Summary(pl.UTF-8): Moduł PHP do emulacji obsługi .htaccess w silniku PHP
Name: php-htscanner
-Version: 0.4
-Release: 0.1
+Version: 0.8.1
+Release: 0.2
License: PHP 3.0
Group: Development/Languages/PHP
-Source0: http://files.zoeloelip.be/htscanner/htscanner-%{version}.tar.bz2
-# Source0-md5: 2880cfe79c72b06e9f783d4ad7991849
-Patch0:%{name}-zts.patch
-URL: http://trac.lighttpd.net/trac/wiki/HowToPhpHtaccess
+Source0: http://pecl.php.net/get/htscanner-%{version}.tgz
+# Source0-md5: 8d3a4a63639c380b9268717a9a28dabe
+URL: http://pecl.php.net/package/htscanner
BuildRequires: php-devel >= 3:5.0
BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
@@ -40,8 +39,7 @@
co katalogu zawierającego żadane skrypty.
%prep
-%setup -q -n htscanner
-%patch0 -p1
+%setup -q -n htscanner-%{version}
%build
phpize
@@ -59,8 +57,10 @@
; Enable %{_modname} extension module
extension=%{_modname}.so
-;htscanner.config_file = .htaccess
-;htscanner.default_docroot = /
+;htscanner.config_file = .htaccess
+;htscanner.default_docroot = /
+;htscanner.default_ttl = 300
+;htscanner.stop_on_error = 0
EOF
%clean
@@ -86,6 +86,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2007/09/01 16:57:49 zergin
+- updated to 0.8.1
+- added all configure options to generated htscanner.ini file
+- dropped path0
+
Revision 1.8 2007/02/13 08:06:39 glen
- tabs in preamble
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-htscanner.spec?r1=1.8&r2=1.9&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: php-htscanner-zts.patch (REMOVED) - dropped
Author: zergin Date: Sat Sep 1 16:59:49 2007 GMT Module: SOURCES Tag: HEAD Log message: - dropped Files affected: SOURCES: php-htscanner-zts.patch (1.1 -> NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: php-htscanner-whitespace.patch (NEW) - patch for tab deli...
Author: zergin Date: Sat Sep 1 21:45:09 2007 GMT
Module: SOURCES Tag: HEAD
Log message:
- patch for tab delimited values when parsing php_values
http://pecl.php.net/bugs/bug.php?id=11959
Files affected:
SOURCES:
php-htscanner-whitespace.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/php-htscanner-whitespace.patch
diff -u /dev/null SOURCES/php-htscanner-whitespace.patch:1.1
--- /dev/null Sat Sep 1 23:45:09 2007
+++ SOURCES/php-htscanner-whitespace.patch Sat Sep 1 23:45:04 2007
@@ -0,0 +1,12 @@
+diff -urN htscanner-0.8.1-2/htscanner.c hts-m/htscanner.c
+--- htscanner-0.8.1-2/htscanner.c 2007-03-23 12:31:59.0 +0100
hts-m/htscanner.c 2007-09-01 23:32:12.757352258 +0200
+@@ -98,6 +98,8 @@
+ PHP_HTSCANNER_LTRIM(name);
+ value = strchr(name, ' ');
+
++ if(!value) value = strchr(name, '\t');
++
+ if (value) {
+ int len;
+ *value = 0;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: php-htscanner.spec - added patch0 (for tab delimed values) ...
Author: zergin Date: Sat Sep 1 21:46:22 2007 GMT
Module: SPECS Tag: HEAD
Log message:
- added patch0 (for tab delimed values)
http://pecl.php.net/bugs/bug.php?id=11959
Files affected:
SPECS:
php-htscanner.spec (1.9 -> 1.10)
Diffs:
Index: SPECS/php-htscanner.spec
diff -u SPECS/php-htscanner.spec:1.9 SPECS/php-htscanner.spec:1.10
--- SPECS/php-htscanner.spec:1.9Sat Sep 1 18:57:49 2007
+++ SPECS/php-htscanner.specSat Sep 1 23:46:17 2007
@@ -4,11 +4,12 @@
Summary(pl.UTF-8): Moduł PHP do emulacji obsługi .htaccess w silniku PHP
Name: php-htscanner
Version: 0.8.1
-Release: 0.2
+Release: 0.1
License: PHP 3.0
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/htscanner-%{version}.tgz
# Source0-md5: 8d3a4a63639c380b9268717a9a28dabe
+Patch0:%{name}-whitespace.patch
URL: http://pecl.php.net/package/htscanner
BuildRequires: php-devel >= 3:5.0
BuildRequires: rpmbuild(macros) >= 1.344
@@ -41,6 +42,9 @@
%prep
%setup -q -n htscanner-%{version}
+# whitespace parsing fix
+%patch0 -p1
+
%build
phpize
%configure \
@@ -86,6 +90,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.10 2007/09/01 21:46:17 zergin
+- added patch0 (for tab delimed values)
+ http://pecl.php.net/bugs/bug.php?id=11959
+
Revision 1.9 2007/09/01 16:57:49 zergin
- updated to 0.8.1
- added all configure options to generated htscanner.ini file
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-htscanner.spec?r1=1.9&r2=1.10&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
