Hello community, here is the log from the commit of package jigdo checked in at Fri May 26 12:59:09 CEST 2006. -------- --- jigdo/jigdo.changes 2006-01-25 21:37:02.000000000 +0100 +++ jigdo/jigdo.changes 2006-05-24 18:08:55.000000000 +0200 @@ -1,0 +2,11 @@ +Wed May 24 18:01:47 CEST 2006 - cthiel@suse.de + +- remove GUI part of jigdo, as it's broken anyway +- removed irrelevant parts from jigdo-0.7.2.patch + +------------------------------------------------------------------- +Sat May 13 18:14:42 CEST 2006 - cthiel@suse.de + +- added wget to Requires + +------------------------------------------------------------------- Old: ---- jigdo-0.7.2.diff New: ---- jigdo-0.7.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jigdo.spec ++++++ --- /var/tmp/diff_new_pack.8i5x87/_old 2006-05-26 12:59:01.000000000 +0200 +++ /var/tmp/diff_new_pack.8i5x87/_new 2006-05-26 12:59:01.000000000 +0200 @@ -1,40 +1,41 @@ # # spec file for package jigdo (Version 0.7.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: jigdo -BuildRequires: curl-devel db-devel gcc-c++ gtk2-devel update-desktop-files wget +BuildRequires: curl-devel db-devel gcc-c++ wget URL: http://atterer.net/jigdo/ License: GPL Group: Productivity/Networking/Other Autoreqprov: on Summary: Jigsaw Download Version: 0.7.2 -Release: 5 +Release: 17 Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.diff +Patch: %{name}-%{version}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: wget %description -Jigsaw Download, or short jigdo, is an intelligent tool that can be -used on the pieces of any chopped-up big file to create a special -"template" file which makes reassembly of the file very easy for users -who only have the pieces. +Jigsaw Download, or jigdo, is an intelligent tool that can be used on +the pieces of any chopped-up big file to create a special template file +that makes reassembly of the file very easy for users who only have the +pieces. What makes jigdo special is that there are no restrictions on what -offsets/sizes the individual pieces have in the original big image. -This makes the program very well suited for distributing CD/DVD images -(or large zip/tar archives) because you can put the files of the CD on -an FTP server - when jigdo is presented the files along with the -template you generated, it is able to recreate the CD image. +offsets or sizes the individual pieces have in the original big image. +This makes the program very well suited for distributing CD or DVD +images (or large zip or tar archives) because you can put the files of +the CD on an FTP server--when jigdo is presented the files along with +the template you generated, it is able to recreate the CD image. @@ -47,19 +48,14 @@ %patch %build -autoconf %configure --prefix=%{_prefix} \ --infodir=%{_infodir} \ - --mandir=%{_mandir} + --mandir=%{_mandir} \ + --with-gui=no make %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/share/applications -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 644 jigdo.desktop $RPM_BUILD_ROOT/usr/share/applications -install -m 644 gfx/jigdo-icon.png $RPM_BUILD_ROOT/usr/share/pixmaps/jigdo.png -%suse_update_desktop_file -i jigdo Application Network %clean rm -rf $RPM_BUILD_ROOT @@ -71,10 +67,13 @@ %{_mandir}/*/* %{_datadir}/locale/*/*/* %{_datadir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png %changelog -n jigdo +* Wed May 24 2006 - cthiel@suse.de +- remove GUI part of jigdo, as it's broken anyway +- removed irrelevant parts from jigdo-0.7.2.patch +* Sat May 13 2006 - cthiel@suse.de +- added wget to Requires * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sun Oct 30 2005 - cthiel@suse.de ++++++ jigdo-0.7.2.patch ++++++ --- Makefile.in +++ Makefile.in @@ -15,7 +15,7 @@ PACKAGE = jigdo INSTALL = @INSTALL@ -INSTALL_EXE = @INSTALL@ -s +INSTALL_EXE = @INSTALL@ INSTALL_DATA = @INSTALL@ -m 644 INSTALL_SCRIPT = @INSTALL@ -m 755 AWK = @AWK@ --- src/cachefile.cc +++ src/cachefile.cc @@ -131,7 +131,7 @@ //________________________________________ Status CacheFile::findName(const byte*& resultData, size_t& resultSize, - const string& fileName, long long int& resultFileSize, + const string& fileName, off_t& resultFileSize, time_t& resultMtime) { DBT key; memset(&key, 0, sizeof(DBT)); key.data = const_cast<char*>(fileName.c_str()); --- src/cachefile.hh +++ src/cachefile.hh @@ -94,7 +94,7 @@ only valid until the next database operation. */ Status findName(const byte*& resultData, size_t& resultSize, const string& fileName, - long long int& resultFileSize, time_t& resultMtime); + off_t& resultFileSize, time_t& resultMtime); /** Insert/overwrite entry for the given file (name must be absolute, file must have the supplied mtime and size). The data --- src/compat.cc +++ src/compat.cc @@ -1,4 +1,4 @@ -/* $Id: compat.cc,v 1.4 2005/07/09 19:14:46 atterer Exp $ -*- C++ -*- +/* $Id: compat.cc,v 1.5 2005/10/15 16:39:46 atterer Exp $ -*- C++ -*- __ _ |_) /| Copyright (C) 2001-2003 | richard@ | \/¯| Richard Atterer | atterer.net @@ -38,15 +38,13 @@ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); if (handle == INVALID_HANDLE_VALUE) return -1; - LARGE_INTEGER targetFileLen; - targetFileLen.QuadPart = length; - LARGE_INTEGER newFileLen; - if (SetFilePointerEx(handle, targetFileLen, &newFileLen, FILE_BEGIN) == 0 - || SetEndOfFile(handle) == 0U) { + LONG lengthHi = length >> 32; + DWORD setPointerRet = SetFilePointer(handle, length, &lengthHi, FILE_BEGIN); + if ((setPointerRet == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) + || SetEndOfFile(handle) == 0) { CloseHandle(handle); return -1; } - Assert(static_cast<uint64>(newFileLen.QuadPart) == length); if (CloseHandle(handle) == 0) return -1; return 0; } --- src/jigdo-file.cc +++ src/jigdo-file.cc @@ -487,6 +487,16 @@ LONGOPT_NOSCANWHOLEFILE, LONGOPT_GREEDYMATCHING, LONGOPT_NOGREEDYMATCHING }; +//______________________________________________________________________ + +void outOfMemory() { + cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; + exit(3); +} +//______________________________________________________________________ + +} // local namespace + // Deal with command line switches JigdoFileCmd::Command JigdoFileCmd::cmdOptions(int argc, char* argv[]) { # if !WINDOWS @@ -722,15 +732,6 @@ return result; } -//______________________________________________________________________ - -void outOfMemory() { - cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; - exit(3); -} -//______________________________________________________________________ - -} // local namespace void exit_tryHelp() { cerr << subst(_("%1: Try `%1 -h' or `man jigdo-file' for more " --- src/mktemplate.hh +++ src/mktemplate.hh @@ -136,7 +136,7 @@ void prepareJigdo(); void finalizeJigdo(const string& imageLeafName, const string& templLeafName, const MD5Sum& templMd5Sum); - INLINE bool MkTemplate::scanFiles(size_t blockLength, uint32 blockMask, + INLINE bool scanFiles(size_t blockLength, uint32 blockMask, size_t md5BlockLength); INLINE bool scanImage(byte* buf, size_t bufferLength, size_t blockLength, uint32 blockMask, size_t md5BlockLength, MD5Sum&); --- src/net/download.hh +++ src/net/download.hh @@ -126,7 +126,7 @@ static size_t curlWriter(void* data, size_t size, size_t nmemb, void* selfPtr); // Called by glibcurl after curl_multi_perform() - static void Download::glibcurlCallback(void*); + static void glibcurlCallback(void*); // Unregister request from glibwww event loop // void pauseNow(); --- src/recursedir.cc +++ src/recursedir.cc @@ -54,6 +54,10 @@ throw RecurseError(err); } +} // local namespace +//________________________________________ + + //______________________________________________________________________ /* Assign the next object name to result. Returns FAILURE if no more @@ -131,8 +135,7 @@ } } -} // local namespace -//________________________________________ + bool RecurseDir::getName(string& result, struct stat* fileInfo, bool checkFiles) --- src/recursedir.hh +++ src/recursedir.hh @@ -101,7 +101,7 @@ string curDir; stack<Level> recurseStack; - inline bool RecurseDir::getNextObjectName(string& result) + inline bool getNextObjectName(string& result) throw(RecurseError); queue<string> objects; // Queue of filenames to output/dirs to recurse into queue<string> objectsFrom; // Files containing filenames ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de