rpms/mingw32-sqlite/devel mingw32-sqlite-3.6.12-no-undefined.patch, NONE, 1.1 sqlite-3.6.12-libdl.patch, NONE, 1.1 sqlite-3.6.12-memalign.patch, NONE, 1.1 sqlite-3.6.12-no-sqlite-doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-sqlite.spec, 1.3, 1.4 sources, 1.2, 1.3 mingw32-sqlite-3.6.6.2-no-undefined.patch, 1.1, NONE sqlite-3.6.6.2-libdl.patch, 1.1, NONE
by sailer
Author: sailer
Update of /cvs/pkgs/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11477
Modified Files:
.cvsignore mingw32-sqlite.spec sources
Added Files:
mingw32-sqlite-3.6.12-no-undefined.patch
sqlite-3.6.12-libdl.patch sqlite-3.6.12-memalign.patch
sqlite-3.6.12-no-sqlite-doc.patch
Removed Files:
mingw32-sqlite-3.6.6.2-no-undefined.patch
sqlite-3.6.6.2-libdl.patch
Log Message:
update to 3.6.12, to match native and enable rtree, fts3
mingw32-sqlite-3.6.12-no-undefined.patch:
--- NEW FILE mingw32-sqlite-3.6.12-no-undefined.patch ---
--- sqlite-3.6.12/Makefile.in.orig 2009-03-30 18:37:16.000000000 +0200
+++ sqlite-3.6.12/Makefile.in 2009-04-23 11:16:17.000000000 +0200
@@ -463,14 +463,15 @@
libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
- ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
+ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" \
+ -no-undefined
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite.lo \
libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \
- -avoid-version
+ -avoid-version -no-undefined
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
$(LTLINK) $(READLINE_FLAGS) \
sqlite-3.6.12-libdl.patch:
--- NEW FILE sqlite-3.6.12-libdl.patch ---
diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
--- sqlite-3.6.4/configure.ac.orig 2008-11-08 11:37:15.000000000 +0200
+++ sqlite-3.6.4/configure.ac 2008-11-08 11:35:50.000000000 +0200
@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
[use_loadextension=$enableval],[use_loadextension=no])
if test "${use_loadextension}" = "yes" ; then
OPT_FEATURE_FLAGS=""
+ AC_SEARCH_LIBS(dlopen, [dl])
else
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
fi
sqlite-3.6.12-memalign.patch:
--- NEW FILE sqlite-3.6.12-memalign.patch ---
---------------------
PatchSet 6171
Date: 2009/04/05 15:22:09
Author: drh
Branch: HEAD
Tag: (none)
Branches:
Log:
Additional code to make sure and to assert that memory allocations have
8-byte alignment. Ticket #3777.
Members:
src/btree.c:1.589->1.590
src/memjournal.c:1.10->1.11
src/pager.c:1.577->1.578
src/sqliteInt.h:1.850->1.851
src/vdbeaux.c:1.446->1.447
src/vdbemem.c:1.139->1.140
Index: sqlite/src/btree.c
diff -u sqlite/src/btree.c:1.589 sqlite/src/btree.c:1.590
--- sqlite/src/btree.c:1.589 Thu Apr 2 20:16:59 2009
+++ sqlite/src/btree.c Sun Apr 5 12:22:09 2009
@@ -5357,13 +5357,13 @@
}
szCell = (u16*)&apCell[nMaxCells];
aCopy[0] = (u8*)&szCell[nMaxCells];
- assert( ((aCopy[0] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+ assert( EIGHT_BYTE_ALIGNMENT(aCopy[0]) );
for(i=1; i<NB; i++){
aCopy[i] = &aCopy[i-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
assert( ((aCopy[i] - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
}
aSpace1 = &aCopy[NB-1][pBt->pageSize+ROUND8(sizeof(MemPage))];
- assert( ((aSpace1 - (u8*)0) & 7)==0 ); /* 8-byte alignment required */
+ assert( EIGHT_BYTE_ALIGNMENT(aSpace1) );
if( ISAUTOVACUUM ){
aFrom = &aSpace1[pBt->pageSize];
}
Index: sqlite/src/memjournal.c
diff -u sqlite/src/memjournal.c:1.10 sqlite/src/memjournal.c:1.11
--- sqlite/src/memjournal.c:1.10 Thu Apr 2 17:22:42 2009
+++ sqlite/src/memjournal.c Sun Apr 5 12:22:09 2009
@@ -237,6 +237,7 @@
*/
void sqlite3MemJournalOpen(sqlite3_file *pJfd){
MemJournal *p = (MemJournal *)pJfd;
+ assert( EIGHT_BYTE_ALIGNMENT(p) );
memset(p, 0, sqlite3MemJournalSize());
p->pMethod = &MemJournalMethods;
}
Index: sqlite/src/pager.c
diff -u sqlite/src/pager.c:1.577 sqlite/src/pager.c:1.578
--- sqlite/src/pager.c:1.577 Sat Apr 4 15:53:48 2009
+++ sqlite/src/pager.c Sun Apr 5 12:22:09 2009
@@ -3114,9 +3114,9 @@
** source file journal.c).
*/
if( sqlite3JournalSize(pVfs)>sqlite3MemJournalSize() ){
- journalFileSize = sqlite3JournalSize(pVfs);
+ journalFileSize = ROUND8(sqlite3JournalSize(pVfs));
}else{
- journalFileSize = sqlite3MemJournalSize();
+ journalFileSize = ROUND8(sqlite3MemJournalSize());
}
/* Set the output variable to NULL in case an error occurs. */
@@ -3172,23 +3172,25 @@
** Journal file name (nPathname+8+1 bytes)
*/
pPtr = (u8 *)sqlite3MallocZero(
- sizeof(*pPager) + /* Pager structure */
- pcacheSize + /* PCache object */
- pVfs->szOsFile + /* The main db file */
- journalFileSize * 2 + /* The two journal files */
- nPathname + 1 + /* zFilename */
- nPathname + 8 + 1 /* zJournal */
+ ROUND8(sizeof(*pPager)) + /* Pager structure */
+ ROUND8(pcacheSize) + /* PCache object */
+ ROUND8(pVfs->szOsFile) + /* The main db file */
+ journalFileSize * 2 + /* The two journal files */
+ nPathname + 1 + /* zFilename */
+ nPathname + 8 + 1 /* zJournal */
);
+ assert( EIGHT_BYTE_ALIGNMENT(journalFileSize) );
if( !pPtr ){
sqlite3_free(zPathname);
return SQLITE_NOMEM;
}
pPager = (Pager*)(pPtr);
- pPager->pPCache = (PCache*)(pPtr += sizeof(*pPager));
- pPager->fd = (sqlite3_file*)(pPtr += pcacheSize);
- pPager->sjfd = (sqlite3_file*)(pPtr += pVfs->szOsFile);
+ pPager->pPCache = (PCache*)(pPtr += ROUND8(sizeof(*pPager)));
+ pPager->fd = (sqlite3_file*)(pPtr += ROUND8(pcacheSize));
+ pPager->sjfd = (sqlite3_file*)(pPtr += ROUND8(pVfs->szOsFile));
pPager->jfd = (sqlite3_file*)(pPtr += journalFileSize);
pPager->zFilename = (char*)(pPtr += journalFileSize);
+ assert( EIGHT_BYTE_ALIGNMENT(pPager->jfd) );
/* Fill in the Pager.zFilename and Pager.zJournal buffers, if required. */
if( zPathname ){
Index: sqlite/src/sqliteInt.h
diff -u sqlite/src/sqliteInt.h:1.850 sqlite/src/sqliteInt.h:1.851
--- sqlite/src/sqliteInt.h:1.850 Wed Apr 1 18:03:01 2009
+++ sqlite/src/sqliteInt.h Sun Apr 5 12:22:09 2009
@@ -456,6 +456,11 @@
#define ROUNDDOWN8(x) ((x)&~7)
/*
+** Assert that the pointer X is aligned to an 8-byte boundary.
+*/
+#define EIGHT_BYTE_ALIGNMENT(X) ((((char*)(X) - (char*)0)&7)==0)
+
+/*
** An instance of the following structure is used to store the busy-handler
** callback for a given sqlite handle.
**
Index: sqlite/src/vdbeaux.c
diff -u sqlite/src/vdbeaux.c:1.446 sqlite/src/vdbeaux.c:1.447
--- sqlite/src/vdbeaux.c:1.446 Wed Mar 25 15:43:09 2009
+++ sqlite/src/vdbeaux.c Sun Apr 5 12:22:09 2009
@@ -1023,6 +1023,7 @@
u8 *pEnd, /* Pointer to 1 byte past the end of *ppFrom buffer */
int *pnByte /* If allocation cannot be made, increment *pnByte */
){
+ assert( EIGHT_BYTE_ALIGNMENT(*ppFrom) );
if( (*(void**)pp)==0 ){
nByte = ROUND8(nByte);
if( (pEnd - *ppFrom)>=nByte ){
@@ -1096,6 +1097,8 @@
if( isExplain && nMem<10 ){
nMem = 10;
}
+ zCsr += (zCsr - (u8*)0)&7;
+ assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
do {
memset(zCsr, 0, zEnd-zCsr);
Index: sqlite/src/vdbemem.c
diff -u sqlite/src/vdbemem.c:1.139 sqlite/src/vdbemem.c:1.140
--- sqlite/src/vdbemem.c:1.139 Sun Mar 29 15:12:10 2009
+++ sqlite/src/vdbemem.c Sun Apr 5 12:22:09 2009
@@ -209,6 +209,7 @@
assert( !(fg&(MEM_Str|MEM_Blob)) );
assert( fg&(MEM_Int|MEM_Real) );
assert( (pMem->flags&MEM_RowSet)==0 );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
if( sqlite3VdbeMemGrow(pMem, nByte, 0) ){
@@ -345,6 +346,7 @@
i64 sqlite3VdbeIntValue(Mem *pMem){
int flags;
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
flags = pMem->flags;
if( flags & MEM_Int ){
return pMem->u.i;
@@ -373,6 +375,7 @@
*/
double sqlite3VdbeRealValue(Mem *pMem){
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
if( pMem->flags & MEM_Real ){
return pMem->r;
}else if( pMem->flags & MEM_Int ){
@@ -403,6 +406,7 @@
assert( pMem->flags & MEM_Real );
assert( (pMem->flags & MEM_RowSet)==0 );
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
pMem->u.i = doubleToInt64(pMem->r);
if( pMem->r==(double)pMem->u.i ){
@@ -416,6 +420,8 @@
int sqlite3VdbeMemIntegerify(Mem *pMem){
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
assert( (pMem->flags & MEM_RowSet)==0 );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
pMem->u.i = sqlite3VdbeIntValue(pMem);
MemSetTypeFlag(pMem, MEM_Int);
return SQLITE_OK;
@@ -427,6 +433,8 @@
*/
int sqlite3VdbeMemRealify(Mem *pMem){
assert( pMem->db==0 || sqlite3_mutex_held(pMem->db->mutex) );
+ assert( EIGHT_BYTE_ALIGNMENT(pMem) );
+
pMem->r = sqlite3VdbeRealValue(pMem);
MemSetTypeFlag(pMem, MEM_Real);
return SQLITE_OK;
diff -u sqlite/src/vdbeaux.c:1.447 sqlite/src/vdbeaux.c:1.448
--- sqlite/src/vdbeaux.c:1.447 Sun Apr 5 12:22:09 2009
+++ sqlite/src/vdbeaux.c Mon Apr 6 11:11:43 2009
@@ -1099,6 +1099,7 @@
}
zCsr += (zCsr - (u8*)0)&7;
assert( EIGHT_BYTE_ALIGNMENT(zCsr) );
+ if( zEnd<zCsr ) zEnd = zCsr;
do {
memset(zCsr, 0, zEnd-zCsr);
sqlite-3.6.12-no-sqlite-doc.patch:
--- NEW FILE sqlite-3.6.12-no-sqlite-doc.patch ---
diff -up sqlite-3.6.12/sqlite3.1.no-sqlite-doc sqlite-3.6.12/sqlite3.1
--- sqlite-3.6.12/sqlite3.1.no-sqlite-doc 2009-04-03 12:37:35.000000000 +0300
+++ sqlite-3.6.12/sqlite3.1 2009-04-03 12:37:44.000000000 +0300
@@ -221,8 +221,6 @@ o All other command line options are pro
.SH SEE ALSO
http://www.sqlite.org/
-.br
-The sqlite-doc package
.SH AUTHOR
This manual page was originally written by Andreas Rottmann
<rotty(a)debian.org>, for the Debian GNU/Linux system (but may be used
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 21 Dec 2008 11:15:27 -0000 1.2
+++ .cvsignore 23 Apr 2009 11:39:18 -0000 1.3
@@ -1 +1,2 @@
sqlite-3.6.6.2.tar.gz
+sqlite-3.6.12.tar.gz
Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-sqlite.spec 26 Feb 2009 01:26:08 -0000 1.3
+++ mingw32-sqlite.spec 23 Apr 2009 11:39:18 -0000 1.4
@@ -5,8 +5,8 @@
%define __find_provides %{_mingw32_findprovides}
Name: mingw32-sqlite
-Version: 3.6.6.2
-Release: 3%{?dist}
+Version: 3.6.12
+Release: 1%{?dist}
Summary: MinGW Windows port of sqlite embeddable SQL database engine
License: Public Domain
@@ -18,11 +18,14 @@
BuildArch: noarch
# Patches from Fedora native package.
-Patch1: sqlite-3.6.6.2-libdl.patch
+Patch1: sqlite-3.6.12-libdl.patch
+# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
+Patch3: sqlite-3.6.12-no-sqlite-doc.patch
+Patch4: sqlite-3.6.12-memalign.patch
# Patches for MinGW port.
-Patch1000: mingw32-sqlite-3.6.6.2-no-undefined.patch
+Patch1000: mingw32-sqlite-3.6.12-no-undefined.patch
BuildRequires: mingw32-filesystem >= 49
BuildRequires: mingw32-gcc
@@ -55,6 +58,8 @@
%setup -q -n sqlite-%{version}
%patch1 -p1 -b .libdl
%patch2 -p1 -b .lemon-sprintf
+%patch3 -p1 -b .no-sqlite-doc
+%patch4 -p1 -b .align
%patch1000 -p1
# Ships with an old/broken version of libtool which cannot create
@@ -72,6 +77,8 @@
# the extension via this export.
# - RWMJ 2008-09-30
export config_TARGET_EXEEXT=.exe
+# add compile flags to enable rtree, fts3
+export MINGW32_CFLAGS="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing"
%{_mingw32_configure}
make
@@ -104,6 +111,10 @@
%changelog
+* Thu Apr 23 2009 Thomas Sailer <t.sailer(a)alumni.ee.ethz.ch> - 3.6.12-1
+- update to 3.6.12 to match native
+- enable rtree, fts3
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.6.6.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-sqlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 21 Dec 2008 11:15:27 -0000 1.2
+++ sources 23 Apr 2009 11:39:18 -0000 1.3
@@ -1 +1 @@
-23cd36188f21d427d45191d317bcbcd5 sqlite-3.6.6.2.tar.gz
+13600865a69a3f54d2ac42a0d6b743db sqlite-3.6.12.tar.gz
--- mingw32-sqlite-3.6.6.2-no-undefined.patch DELETED ---
--- sqlite-3.6.6.2-libdl.patch DELETED ---
15 years
rpms/mingw32-filesystem/F-11 mingw32-filesystem.spec, 1.21, 1.22 mingw32-find-requires.sh, 1.1, 1.2
by Richard W.M. Jones
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-filesystem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28168
Modified Files:
mingw32-filesystem.spec mingw32-find-requires.sh
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-11/mingw32-filesystem.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mingw32-filesystem.spec 27 Mar 2009 09:20:25 -0000 1.21
+++ mingw32-filesystem.spec 21 Apr 2009 22:25:53 -0000 1.22
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 50
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -158,6 +158,9 @@
%changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones(a)redhat.com> - 50-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
* Fri Mar 27 2009 Richard W.M. Jones <rjones(a)redhat.com> - 50-3
- Fix up and test mingw32-pkg-config changes.
Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-11/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh 30 Oct 2008 09:49:17 -0000 1.1
+++ mingw32-find-requires.sh 21 Apr 2009 22:25:53 -0000 1.2
@@ -22,7 +22,7 @@
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
for f in $dlls; do
- $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+ $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
tr [:upper:] [:lower:] |
sed 's/\(.*\)/mingw32(\1)/'
done | sort -u
15 years
Fwd: [announce] dbus4win
by Richard W.M. Jones
From: Marc Mutz <marc(a)kdab.net>
To: dbus(a)lists.freedesktop.org, windbus-devel(a)lists.sf.net
Subject: [announce] dbus4win
Date: Tue, 21 Apr 2009 11:04:10 +0200
Hi,
I'd like to announce that we at KDAB are working on 'dbus4win', which we li=
ke=20
to think of as a re-unification of the freedesktop.org GIT tree and the=20
windbus.sf.net SVN tree. To this end, we already spent some time to graft t=
he=20
SVN tree onto the git tree (windbus-svn branch).
There are three areas we are currently focusing on:
1. cleaning up the SVN history (dbus4win branch)
This is an attempt to rebase the remaining diff between the SVN tree and
dbus-1.2 onto dbus-1.2, preserving the windbus history where possible.
2. Make dbus cross-compile with mingw (xcompile branch)
This is needed for the gpg4win (www.gpg4win.org), and Kontact-on-Windows
projects, as well as for all the reasons mentioned in
http://lwn.net/Articles/307732/
3. Implement the unix transport for Windows using the design already chosen
for libassuan. This consists of writing plain text files with a nonce and
the tcp port number of the server into the filesystem location where on
Unix the Unix Domain Socket special file would go. Current windbus is not
really usable for multiuser systems, though there was a patch recently
trying to address that, but falling short of the full solution. There are
certainly other ways to implement a per-user transport on Windows, but t=
his
design has proven itself in libassuan, an extremely security-conscious
library (IPC lib for gnupg components).
Please note that all this is still work in progress. None of the three focu=
s=20
points are completed yet. In particular, the branches in the above reposito=
ry=20
are subject to regular rebasing (exceptions: dbus-1.2 and master, which tra=
ck=20
=46D.org git), so don't git-pull, but git-fetch/git-rebase instead. Nonethe=
less=20
we invite interested parties to review the patches, and FD.org dbus=20
maintainers to pull from our for_upstream branch.
=46ind the tree at
http://repo.or.cz/w/dbus4win.git
Drop me a note if you'd like push access. You need a repo.or.cz account for=
=20
that, though you can use the open mob account (http://repo.or.cz/mob) for=20
fire-and-forget commits.
Our hope is that
=2D windbus developers consider using GIT from now on for easier patch migr=
ation
and merging.
=2D freedesktop.org maintainers will consider Windows a first-class citizen=
once
crosscompilation works
=2D world peace
To this end, KDAB is committed to doing its share in continually maintainin=
g=20
dbus on the Windows platform.
Signed-off-by: Till Adam <till(a)kdab.net> :)
Thanks,
Marc
=2D-=20
Marc Mutz <marc(a)kdab.com> | Senior Software Engineer
KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company
www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-Independent Software Solutions
----- End forwarded message -----
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v
15 years
rpms/mingw32-filesystem/devel mingw32-filesystem.spec, 1.21, 1.22 mingw32-find-requires.sh, 1.1, 1.2
by Richard W.M. Jones
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28269
Modified Files:
mingw32-filesystem.spec mingw32-find-requires.sh
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-filesystem.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mingw32-filesystem.spec 27 Mar 2009 09:20:25 -0000 1.21
+++ mingw32-filesystem.spec 21 Apr 2009 22:25:56 -0000 1.22
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 50
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -158,6 +158,9 @@
%changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones(a)redhat.com> - 50-4
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
* Fri Mar 27 2009 Richard W.M. Jones <rjones(a)redhat.com> - 50-3
- Fix up and test mingw32-pkg-config changes.
Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/devel/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh 30 Oct 2008 09:49:17 -0000 1.1
+++ mingw32-find-requires.sh 21 Apr 2009 22:25:57 -0000 1.2
@@ -22,7 +22,7 @@
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
for f in $dlls; do
- $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+ $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
tr [:upper:] [:lower:] |
sed 's/\(.*\)/mingw32(\1)/'
done | sort -u
15 years
rpms/mingw32-filesystem/EL-5 mingw32-filesystem.spec, 1.10, 1.11 mingw32-find-requires.sh, 1.1, 1.2
by Richard W.M. Jones
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-filesystem/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28203
Modified Files:
mingw32-filesystem.spec mingw32-find-requires.sh
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mingw32-filesystem.spec 14 Jan 2009 10:18:30 -0000 1.10
+++ mingw32-filesystem.spec 21 Apr 2009 22:25:54 -0000 1.11
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 40
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -144,6 +144,9 @@
%changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones(a)redhat.com> - 40-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
* Wed Jan 14 2009 Richard W.M. Jones <rjones(a)redhat.com> - 40-3
- Add pseudo-provides secur32.dll
Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh 30 Oct 2008 09:49:16 -0000 1.1
+++ mingw32-find-requires.sh 21 Apr 2009 22:25:55 -0000 1.2
@@ -22,7 +22,7 @@
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
for f in $dlls; do
- $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+ $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
tr [:upper:] [:lower:] |
sed 's/\(.*\)/mingw32(\1)/'
done | sort -u
15 years
rpms/mingw32-filesystem/F-10 mingw32-filesystem.spec, 1.10, 1.11 mingw32-find-requires.sh, 1.1, 1.2
by Richard W.M. Jones
Author: rjones
Update of /cvs/pkgs/rpms/mingw32-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28134
Modified Files:
mingw32-filesystem.spec mingw32-find-requires.sh
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).
Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mingw32-filesystem.spec 19 Feb 2009 13:30:08 -0000 1.10
+++ mingw32-filesystem.spec 21 Apr 2009 22:25:54 -0000 1.11
@@ -2,7 +2,7 @@
Name: mingw32-filesystem
Version: 40
-Release: 3%{?dist}.2
+Release: 3%{?dist}.3
Summary: MinGW base filesystem and environment
Group: Development/Libraries
@@ -147,6 +147,9 @@
%changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones(a)redhat.com> - 40-3.3
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
* Thu Feb 19 2009 Richard W.M. Jones <rjones(a)redhat.com> - 40-3.fc10.2
- Added virtual provides for mingw32(cfgmgr32.dll) and mingw32(setupapi.dll).
Index: mingw32-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-find-requires.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-find-requires.sh 30 Oct 2008 09:49:17 -0000 1.1
+++ mingw32-find-requires.sh 21 Apr 2009 22:25:54 -0000 1.2
@@ -22,7 +22,7 @@
dlls=$(echo $filelist | tr [:blank:] '\n' | grep -Ei '\.(dll|exe)$')
for f in $dlls; do
- $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._[:alnum:]]+\.dll' |
+ $OBJDUMP -p $f | grep 'DLL Name' | grep -Eo '[-._\+[:alnum:]]+\.dll' |
tr [:upper:] [:lower:] |
sed 's/\(.*\)/mingw32(\1)/'
done | sort -u
15 years
