Hello community, here is the log from the commit of package jhead for openSUSE:Factory checked in at 2012-07-02 21:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jhead (Old) and /work/SRC/openSUSE:Factory/.jhead.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jhead", Maintainer is "sbrabec@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/jhead/jhead.changes 2012-03-22 12:33:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jhead.new/jhead.changes 2012-07-02 21:22:48.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 2 09:26:57 UTC 2012 - toganm@opensuse.org + +- Update to version 2.96 + * Fix printing file info when -ft option is used + * Do not skip readonle files with -st option + +------------------------------------------------------------------- Old: ---- jhead-2.95.tar.gz New: ---- jhead-2.96.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jhead.spec ++++++ --- /var/tmp/diff_new_pack.0g2Lrs/_old 2012-07-02 21:22:49.000000000 +0200 +++ /var/tmp/diff_new_pack.0g2Lrs/_new 2012-07-02 21:22:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: jhead -Version: 2.95 +Version: 2.96 Release: 0 Requires: %{_bindir}/jpegtran Requires: %{_bindir}/mogrify ++++++ jhead-2.95.tar.gz -> jhead-2.96.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhead-2.95/changes.txt new/jhead-2.96/changes.txt --- old/jhead-2.95/changes.txt 2012-03-16 17:59:57.000000000 +0100 +++ new/jhead-2.96/changes.txt 2012-06-22 17:00:21.000000000 +0200 @@ -380,3 +380,8 @@ -------Released version 2.95 -- Mar 16 2012 -------- +Jun 18 2012: +Fix printing file info when -ft option is used +Do not skip readonle files with -st option + +-------Released version 2.96 -- Jun 22 2012 -------- \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhead-2.95/jhead.1 new/jhead-2.96/jhead.1 --- old/jhead-2.95/jhead.1 2012-03-16 17:59:57.000000000 +0100 +++ new/jhead-2.96/jhead.1 2012-06-22 17:00:21.000000000 +0200 @@ -1,4 +1,4 @@ -.TH JHEAD 1 "16 Mar 2012" "jhead 2.95" +.TH JHEAD 1 "22 Jun 2012" "jhead 2.96" .SH NAME jhead - Digicam JPEG Exif header manipulation tool .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhead-2.95/jhead.c new/jhead-2.96/jhead.c --- old/jhead-2.95/jhead.c 2012-03-16 17:59:57.000000000 +0100 +++ new/jhead-2.96/jhead.c 2012-06-22 17:00:21.000000000 +0200 @@ -2,12 +2,12 @@ // Program to pull the information out of various types of EXIF digital // camera files and show it in a reasonably consistent way // -// Version 2.95 +// Version 2.96 // // Compiling under Windows: // Make sure you have Microsoft's compiler on the path, then run make.bat // -// Dec 1999 - Mar 2012 +// Dec 1999 - Jun 2012 // // by Matthias Wandel www.sentex.net/~mwandel //-------------------------------------------------------------------------- @@ -15,7 +15,7 @@ #include <sys/stat.h> -#define JHEAD_VERSION "2.95" +#define JHEAD_VERSION "2.96" // This #define turns on features that are too very specific to // how I organize my photos. Best to ignore everything inside #ifdef MATTHIAS @@ -807,7 +807,7 @@ } } - if (DoModify || RenameToDate || Exif2FileTime){ + if ((DoModify & MODIFY_ANY) || RenameToDate || Exif2FileTime){ if (access(FileName, 2 /*W_OK*/)){ printf("Skipping readonly file '%s'\n",FileName); return; @@ -1168,13 +1168,11 @@ struct tm tm; time_t UnixTime; struct utimbuf mtime; - if (!Exif2tm(&tm, ImageInfo.DateTime)) goto badtime; - + if (!Exif2tm(&tm, ImageInfo.DateTime)) goto badtime; UnixTime = mktime(&tm); if ((int)UnixTime == -1){ goto badtime; } - mtime.actime = UnixTime; mtime.modtime = UnixTime; @@ -1207,7 +1205,7 @@ static void Usage (void) { printf("Jhead is a program for manipulating settings and thumbnails in Exif jpeg headers\n" - "used by most Digital Cameras. v"JHEAD_VERSION" Matthias Wandel, Mar 16 2012.\n" + "used by most Digital Cameras. v"JHEAD_VERSION" Matthias Wandel, Jun 22 2012.\n" "http://www.sentex.net/~mwandel/jhead\n" "\n"); @@ -1242,6 +1240,10 @@ " date otherwise. If the optional format-string is not supplied,\n" " the format is mmdd-hhmmss. If a format-string is given, it is\n" " is passed to the 'strftime' function for formatting\n" + " %%d Day of month %%H Hour (24-hour)\n" + " %%m Month number %%M Minute %%S Second\n" + " %%y Year (2 digit 00 - 99) %%Y Year (4 digit 1980-2036)\n" + " For more arguments, look up the 'strftime' function.\n" " In addition to strftime format codes:\n" " '%%f' as part of the string will include the original file name\n" " '%%i' will include a sequence number, starting from 1. You can\n" @@ -1513,6 +1515,7 @@ #endif }else if (!strcmp(arg,"-ft")){ Exif2FileTime = TRUE; + DoModify |= MODIFY_ANY; }else if (!memcmp(arg,"-ta",3)){ // Time adjust feature. int hours, minutes, seconds, n; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhead-2.95/jhead.spec new/jhead-2.96/jhead.spec --- old/jhead-2.95/jhead.spec 2012-03-16 17:59:57.000000000 +0100 +++ new/jhead-2.96/jhead.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1,157 +0,0 @@ -# ----------------------------------------------------- -# Define static values -# ----------------------------------------------------- - -# ----------------------------------------------------- -# Define requirements for configure, BuildRequire, -# Require and so on (depending on macros) -# ----------------------------------------------------- - -# ----------------------------------------------------- -# RPM-Information -# ----------------------------------------------------- -Name: jhead -Summary: Tool for handling EXIF metadata in JPEG image files - -Version: 2.93 -Release: 0 - -Group: Libraries -License: Public Domain -URL: http://www.sentex.net/~mwandel/jhead/ - -Source: http://www.sentex.net/~mwandel/jhead/%{name}-%{version}.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: glibc-devel - -# ----------------------------------------------------- -# Package-Information (for main package) -# ----------------------------------------------------- -%description -This package provides a tool for displaying and manipulating non-image -portions of EXIF format JPEG image files, as produced by most digital cameras. - -# ----------------------------------------------------- -# Prepare-Section -# ----------------------------------------------------- -%prep -%setup -q - -# ----------------------------------------------------- -# Build-Section -# ----------------------------------------------------- -%build -make %{?_smp_mflags} - -# ----------------------------------------------------- -# Install-Section -# ----------------------------------------------------- -%install -mkdir -p %{buildroot}%{_bindir} -cp jhead %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/man1/ -cp jhead.1.gz %{buildroot}%{_mandir}/man1/ - -# ----------------------------------------------------- -# Clean-Section -# ----------------------------------------------------- -%clean -rm -rf %{buildroot} - -# ----------------------------------------------------- -# Files-Section (for main package) -# ----------------------------------------------------- -%files -%defattr(0644,root,root,0755) -%attr(0755,root,root) %{_bindir}/* -%doc readme.txt usage.html -%{_mandir}/man1/jhead.1.gz - -# ----------------------------------------------------- -# Changelog-Section -# ----------------------------------------------------- -%changelog - -* Fri Dec 2 2011 - 2.92 -- Hanle UTF8 in IPTC -- Fix error in help - -* Fri Feb 5 2010 - 2.90 -- Improvements to IPTC handling -- Handle mixted-endian-ness files from newer Canon point and shoot cameras. - -* Fri Nov 6 2009 - 2.88 -- Added ability to move files around with the -n command -- Various minor bugfixes and maintenance changes - -* Thu Mar 3 2009 - 2.87 -- Added the ability to move files with the -n option -- Fix a bunch of breakages from security fixes asked - for by debian people - -* Sat Feb 14 2009 - 2.86 -- Added ability to move files around with the -n command -- Various minor bugfixes and maintenance changes - -* Mon Oct 4 2008 - 2.84 -- decode more exif tags in -v mode -- Fix gpsinfo altitude bug -- Fix several potential stirng overflows - -* Thu Apr 03 2008 - 2.82 -- No longer delete XMP section on some operations -- Improve IPTC display -- Minor tweaks and cleanups - -* Tue Nov 13 2007 - 2.8 -- Limited IPTC handling -- Added -q option -- Fix handling of corrupted GPS directory. -- Extract focus distance from canon makernote. -- Extract subject range (pentax and fuji cameras) - -* Thu Jan 11 2007 - 2.7 -- Release version 2.7 - -* Sat Apr 29 2006 - 2.6 -- Release version 2.6 - -* Sun Jan 08 2006 - 2.5 -- Release version 2.5 - -* Thu Jun 10 2005 - 2.4-2 -- Minor fixups. - -* Sun May 29 2005 - 2.4 -- Display gps info -- Added -da optino for large date adjust -- Fix time reference bug for -ta option -- Fix crashes with some corrupt jpeg files - -* Mon Jan 03 2005 - 2.4 -- Handle readonly files better -- Handle more strange jpegs -- added 'purejpg' option -- Display digital zoom ratio - -* Sun Jun 20 2004 - 2.2-0 -- Various bug and spelling fixes. -- added ability to do sequential renaming - -* Tue Jan 08 2004 Matthias Wandel <mwandel[at]sentex.net> - 2.1-0 -- Bumped version number to 2.1 for new jhead release. -- Added -cl feature -- added -noroot feature - -* Tue Jun 03 2003 Oliver Pitzeier <oliver@linux-kernel.at> - 2.0-3 -- Specfile cleanup/beautifying -- Use _smp_mflags within make -- Add versions to the changelog entries - -* Mon Apr 14 2003 Matthias Wandel <mwandel[at]sentex.net> - 2.0-2 -- First jhead 2.0 RPM built by me. -- Finally wrote a nice man page for jhead -- Using jhead 1.9 RPM from connectiva linux as starting point (left in the portugese tags) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jhead-2.95/usage.html new/jhead-2.96/usage.html --- old/jhead-2.95/usage.html 2012-03-16 17:59:57.000000000 +0100 +++ new/jhead-2.96/usage.html 2012-06-22 17:00:21.000000000 +0200 @@ -8,7 +8,7 @@ or Mac OS-X won't do anything for you - you have to <b>use it from the Command prompt</b> -<h3>Jhead v2.95 program Features</h3> +<h3>Jhead v2.96 program Features</h3> <ul> <li>Extracting camera settings from Exif image files <li>Able to set and/or adjust the Exif time field @@ -454,6 +454,6 @@ </ul> <p><br> Jhead homeage: <a href="http://www.sentex.net/~mwandel/jhead">http://www.sentex.net/~mwandel/jhead</a><br> -Last Updated: Mar 16 2012 +Last Updated: Jun 22 2012 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org