[rpms/jigdo] epel10.2: auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm

[Ian Burrell <iburrell@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/jigdo
Branch : epel10.2
Commit : 0d8ed6a964c76efa057b657bf8337c576e25e81c
Author : Ian Burrell <iburrell@fedoraproject.org>
Date   : 2006-03-22T04:35:15+00:00
Stats  : +330/-0 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/jigdo/c/0d8ed6a964c76efa057b657bf8337c576e25e81c?branch=epel10.2

Log:
auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm

---
diff --git a/.cvsignore b/.cvsignore
index e69de29..a652e6e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+jigdo-0.7.2.tar.bz2

diff --git a/jigdo-0.7.1-debug.patch b/jigdo-0.7.1-debug.patch
new file mode 100644
index 0000000..8928f94
--- /dev/null
+++ b/jigdo-0.7.1-debug.patch
@@ -0,0 +1,11 @@
+--- jigdo-0.7.1/configure.debug	2004-06-20 16:49:15.000000000 -0400
++++ jigdo-0.7.1/configure	2005-04-15 18:19:10.000000000 -0400
+@@ -2723,8 +2723,6 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'`
+-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'`
+ IF_GXX2="#"
+ IF_NOGXX2=""
+ if test "$GXX" = yes; then

diff --git a/jigdo-0.7.2-amd64.patch b/jigdo-0.7.2-amd64.patch
new file mode 100644
index 0000000..6452bf7
--- /dev/null
+++ b/jigdo-0.7.2-amd64.patch
@@ -0,0 +1,46 @@
+Index: src/cachefile.hh
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/cachefile.hh,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -b -B -r1.3 -r1.4
+--- src/cachefile.hh	2 Jul 2005 22:05:03 -0000	1.3
++++ src/cachefile.hh	21 Jul 2005 11:31:43 -0000	1.4
+@@ -1,4 +1,4 @@
+-/* $Id: cachefile.hh,v 1.3 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*-
++/* $Id: cachefile.hh,v 1.4 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*-
+   __   _
+   |_) /|  Copyright (C) 2001-2002  |  richard@
+   | \/�|  Richard Atterer          |  atterer.net
+@@ -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
+Index: src/cachefile.cc
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/cachefile.cc,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -b -B -r1.7 -r1.8
+--- src/cachefile.cc	2 Jul 2005 22:05:03 -0000	1.7
++++ src/cachefile.cc	21 Jul 2005 11:31:43 -0000	1.8
+@@ -1,4 +1,4 @@
+-/* $Id: cachefile.cc,v 1.7 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*-
++/* $Id: cachefile.cc,v 1.8 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*-
+   __   _
+   |_) /|  Copyright (C) 2001-2003  |  richard@
+   | \/�|  Richard Atterer          |  atterer.net
+@@ -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());

diff --git a/jigdo-0.7.2-gcc41.patch b/jigdo-0.7.2-gcc41.patch
new file mode 100644
index 0000000..96731e8
--- /dev/null
+++ b/jigdo-0.7.2-gcc41.patch
@@ -0,0 +1,117 @@
+? jigdo-gcc41.patch
+Index: src/jigdo-file.cc
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/jigdo-file.cc,v
+retrieving revision 1.19
+diff -u -b -B -r1.19 jigdo-file.cc
+--- src/jigdo-file.cc	5 Jul 2005 12:47:17 -0000	1.19
++++ src/jigdo-file.cc	29 Jan 2006 23:42:14 -0000
+@@ -477,6 +477,16 @@
+ }
+ //______________________________________________________________________
+ 
++//______________________________________________________________________
++
++void outOfMemory() {
++  cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl;
++  exit(3);
++}
++//______________________________________________________________________
++
++} // local namespace
++
+ enum {
+   LONGOPT_BUFSIZE = 0x100, LONGOPT_NOFORCE, LONGOPT_MINSIZE,
+   LONGOPT_MD5SIZE, LONGOPT_MKIMAGECHECK, LONGOPT_NOMKIMAGECHECK,
+@@ -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 "
+Index: src/mktemplate.hh
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/mktemplate.hh,v
+retrieving revision 1.9
+diff -u -b -B -r1.9 mktemplate.hh
+--- src/mktemplate.hh	5 Jul 2005 12:26:20 -0000	1.9
++++ src/mktemplate.hh	29 Jan 2006 23:42:14 -0000
+@@ -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&);
+Index: src/recursedir.cc
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/recursedir.cc,v
+retrieving revision 1.9
+diff -u -b -B -r1.9 recursedir.cc
+--- src/recursedir.cc	2 Jul 2005 22:05:04 -0000	1.9
++++ src/recursedir.cc	29 Jan 2006 23:42:14 -0000
+@@ -56,6 +56,10 @@
+ 
+   //______________________________________________________________________
+ 
++} // local namespace
++//________________________________________
++
++
+   /* Assign the next object name to result. Returns FAILURE if no more
+      names available. Note: An object name is immediately removed from
+      the start of "objects" when it is copied to "result". The name of
+@@ -130,9 +134,6 @@
+       }
+     }
+   }
+-
+-} // local namespace
+-//________________________________________
+ 
+ bool RecurseDir::getName(string& result, struct stat* fileInfo,
+                          bool checkFiles) 
+Index: src/recursedir.hh
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/recursedir.hh,v
+retrieving revision 1.6
+diff -u -b -B -r1.6 recursedir.hh
+--- src/recursedir.hh	4 Jul 2005 10:25:10 -0000	1.6
++++ src/recursedir.hh	29 Jan 2006 23:42:14 -0000
+@@ -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
+Index: src/net/download.hh
+===================================================================
+RCS file: /cvsroot/jigdo/jigdo/src/net/download.hh,v
+retrieving revision 1.16
+diff -u -b -B -r1.16 download.hh
+--- src/net/download.hh	9 Apr 2005 23:09:52 -0000	1.16
++++ src/net/download.hh	29 Jan 2006 23:55:04 -0000
+@@ -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();

diff --git a/jigdo.desktop b/jigdo.desktop
new file mode 100644
index 0000000..317a03e
--- /dev/null
+++ b/jigdo.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Jigsaw Download Manager
+GenericName=Download Manager
+Comment=Download files prepared for Jigdo
+Exec=jigdo
+Icon=jigdo-icon.png
+Terminal=false
+StartupWMClass="jigdo"
+Type=Application
+Categories=GTK;Application;Network;
+Encoding=UTF-8

diff --git a/jigdo.spec b/jigdo.spec
new file mode 100644
index 0000000..193b0ec
--- /dev/null
+++ b/jigdo.spec
@@ -0,0 +1,143 @@
+Name:		jigdo
+Version:	0.7.2
+Release:	3
+Summary:	Ease distribution of large files over the Internet
+
+Group:		Applications/Internet
+License:	GPL
+URL:		http://atterer.net/jigdo/
+Source0:	http://atterer.net/jigdo/%{name}-%{version}.tar.bz2
+Source1:    jigdo.desktop
+Patch0:		jigdo-0.7.2-amd64.patch
+Patch1:		jigdo-0.7.1-debug.patch
+Patch2:		jigdo-0.7.2-gcc41.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	db4-devel, bzip2-devel, curl-devel, /bin/awk, gettext
+BuildRequires:	desktop-file-utils, gtk2-devel >= 0:2.0.6
+Requires:	wget
+
+%description
+Jigsaw Download, or short jigdo, is a tool designed to ease the
+distribution of very large files over the internet, for example CD or
+DVD images.  Its aim is to make downloading the images as easy for
+users as a click on a direct download link in a browser, while
+avoiding all the problems that server administrators have with hosting
+such large files.  It accomplishes this by using the separate pieces
+of any big file (such as the files contained within a CD/DVD image) to
+create a special "template" file which makes reassembly of the big
+file very easy for users who only have the pieces.
+
+%prep
+%setup -q
+%patch0 -p0 -b .amd64
+%patch1 -p1 -b .debug
+%patch2 -p0 -b .gcc41
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_EXE="/usr/bin/install -c" install
+# remove debian-specific script
+rm -f   $RPM_BUILD_ROOT%{_bindir}/jigdo-mirror \
+	$RPM_BUILD_ROOT%{_mandir}/man?/jigdo-mirror*
+%find_lang %{name}
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora \
+        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
+        --add-category X-Fedora-Extra \
+	%{SOURCE1}
+
+# icon
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 0644 -p gfx/jigdo-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc changelog COPYING README THANKS doc/*.html doc/TechDetails.txt doc/README-bindist.txt
+%{_bindir}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%{_datadir}/pixmaps/jigdo-icon.png
+%{_datadir}/applications/*
+%attr(0644,root,root) %{_mandir}/man[^3]/*
+
+%changelog
+* Wed Mar  8 2006 Ian Burrell <ianburrell@gmail.com> - 0.7.2-3
+- Remove dependency on w3c-libwww
+
+* Sun Jan 29 2006 Ian Burrell <ianburrell@gmail.com> - 0.7.2-2
+- Cleanup BuildRequires
+- Patch for GCC 4.1
+
+* Thu Dec 22 2005 Ian Burrell <ianburrell@gmail.com> - 0.7.2-1
+- Update to 0.7.2
+- Patch from CVS for 64-bit
+
+* Fri Apr 15 2005 Charles R. Anderson <cra@wpi.edu> 0.7.1-4
+- add gcc4 patch
+- remove --enable-debug and patch out configure's removal of -g
+
+* Fri Apr 15 2005 Charles R. Anderson <cra@wpi.edu> 0.7.1-3
+- BR gettext instead
+- move icon back to /usr/share/pixmaps
+- add Category GTK to desktop file
+
+* Fri Apr 15 2005 Charles R. Anderson <cra@wpi.edu> 0.7.1-2
+- BR gettext-devel
+- desktop category X-Fedora-Extra
+
+* Mon Apr 11 2005 Charles R. Anderson <cra@wpi.edu> 0.7.1-1
+- prepare for Fedora Extras
+- update to 0.7.1
+- remove unneeded db41 and debug patches
+
+* Fri Jul 02 2004 Charles R. Anderson <cra@wpi.edu> 0:0.7.0-0.fdr.5
+- install icon to /usr/share/jigdo/pixmaps and use that path in desktop file
+- remove jigdo-mirror, since it is debian-specific
+
+* Tue Jun 01 2004 Charles R. Anderson <cra@wpi.edu> 0:0.7.0-0.fdr.4
+- don't strip binaries so debuginfo is created properly
+- make jigdo-icon.png non-executable
+- fixup buildroot path in jigdo-lite
+- use more descriptive summary, description, and desktop file metadata
+
+* Mon Feb 02 2004 Charles R. Anderson <cra@wpi.edu> 0:0.7.0-0.fdr.3
+- Revise patch to compile against db-4.1+
+
+* Mon Feb 02 2004 Charles R. Anderson <cra@wpi.edu> 0:0.7.0-0.fdr.2
+- Add patch to compile against db-4.2.
+- BuildRequires: zlib-devel, /bin/awk
+- Requires: wget
+- Integrate jigdo.desktop into .spec file
+
+* Sat Jan 31 2004 Charles R. Anderson <cra@wpi.edu> 0:0.7.0-0.fdr.1
+- Initial fedoraized release
+- Install i18n files
+- Install desktop file and icon
+- Add a bunch of BuildRequires
+
+* Mon Jan 26 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.2-4mdk
+- Icons will be provided in the gfx subdirectory of the tarball
+
+* Sun Jan 25 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.2-3mdk
+- Jigdo compiles with gcc 2.96 now
+- Only re-define the macros if they aren't yet defined
+
+* Sat Jan 24 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.2-2mdk
+- Make the SPEC be generic, so that it can be built on non-Mandrake
+  machines
+
+* Sat Jan 24 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.2-1mdk
+- 0.6.2
+- Remove patch1 - merged upstream
+
+* Tue Jan 22 2002 Alexander Skwar <ASkwar@DigitalProjects.com> 0.6.1-1mdk
+- First Mandrake release
+

diff --git a/sources b/sources
index e69de29..46e7064 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+031756ff6c7084a139dc9550a27f6906  jigdo-0.7.2.tar.bz2