rpms/feh/F-7 feh-1.3.4-bz441527.patch, NONE, 1.1 feh-1.3.4-man.patch, NONE, 1.1 feh-1.3.4-missing-protos.patch, NONE, 1.1 feh-1.3.4-remove_britney_references.patch, NONE, 1.1 feh-1.3.4-svn-fixes.patch, NONE, 1.1 feh.spec, 1.9, 1.10 sources, 1.4, 1.5
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu Apr 10 11:55:08 UTC 2008
- Previous message (by thread): rpms/feh/F-8 feh-1.3.4-bz441527.patch, NONE, 1.1 feh-1.3.4-man.patch, NONE, 1.1 feh-1.3.4-missing-protos.patch, NONE, 1.1 feh-1.3.4-remove_britney_references.patch, NONE, 1.1 feh-1.3.4-svn-fixes.patch, NONE, 1.1 feh.spec, 1.10, 1.11 sources, 1.4, 1.5
- Next message (by thread): rpms/roundcubemail/devel roundcubemail.spec,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/feh/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30974
Modified Files:
feh.spec sources
Added Files:
feh-1.3.4-bz441527.patch feh-1.3.4-man.patch
feh-1.3.4-missing-protos.patch
feh-1.3.4-remove_britney_references.patch
feh-1.3.4-svn-fixes.patch
Log Message:
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.4-8
- Remove non free menubg_britney.png from sources
- Apply various fixes from svn
- Some makeup fixes to the manpage (courtesy of debian)
- Fix escaping of filenames in "feh --bg-scale" (bz 441527)
feh-1.3.4-bz441527.patch:
--- NEW FILE feh-1.3.4-bz441527.patch ---
diff -up feh-1.3.4/src/support.c.foo feh-1.3.4/src/support.c
--- feh-1.3.4/src/support.c.foo 2008-04-10 11:38:46.000000000 +0200
+++ feh-1.3.4/src/support.c 2008-04-10 11:38:46.000000000 +0200
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include "filelist.h"
#include "options.h"
#include "support.h"
+#include <limits.h>
Window ipc_win = None;
Window my_ipc_win = None;
Atom ipc_atom = None;
@@ -162,7 +163,7 @@ feh_wm_set_bg(char *fil, Imlib_Image im,
/* string for sticking in ~/.fehbg */
char *fehbg = NULL;
char *home;
- char filbuf[4096];
+ char filbuf[PATH_MAX];
/* local display to set closedownmode on */
Display *disp2;
@@ -170,11 +171,22 @@ feh_wm_set_bg(char *fil, Imlib_Image im,
int depth2;
XGCValues gcvalues;
GC gc;
- int w, h;
+ int in, out, w, h;
D(3, ("Falling back to XSetRootWindowPixmap\n"));
- snprintf(filbuf, sizeof(filbuf), "\"%s\"", fil);
+ /* Put the filename in filbuf between ' and escape ' in the filename */
+ out = 0;
+ filbuf[out++] = '\'';
+ for (in = 0; fil[in] && out < (PATH_MAX-4); in++) {
+ if (fil[in] == '\'') {
+ filbuf[out++] = '\\';
+ }
+ filbuf[out++] = fil[in];
+ }
+ filbuf[out++] = '\'';
+ filbuf[out++] = 0;
+
if (scaled) {
w = scr->width;
h = scr->height;
diff -up feh-1.3.4/src/options.c.foo feh-1.3.4/src/options.c
--- feh-1.3.4/src/options.c.foo 2008-04-10 11:25:55.000000000 +0200
+++ feh-1.3.4/src/options.c 2008-04-10 11:25:55.000000000 +0200
@@ -985,7 +985,7 @@ show_usage(void)
" Feh stores the commandline necessary to restore\n"
" the background you chose in ~/.fehbg. So to have\n"
" feh-set backgrounds restored when you restart X,\n"
-" add the line \"eval `cat $HOME/.fehbg`\" to your\n"
+" add the line \"`cat $HOME/.fehbg`\" to your\n"
" X startup script (e.g. ~/.xsession). Note that\n"
" you only need to do this for non E window\n"
" managers.\n"
" --fontpath PATH Specify an extra directory to look in for fonts,\n"
" can be used multiple times to add multiple paths.\n"
" -M, --menu-font FONT Use FONT for the font in menus.\n"
diff -up feh-1.3.4/feh.1.foo feh-1.3.4/feh.1
--- feh-1.3.4/feh.1.foo 2008-04-10 11:25:55.000000000 +0200
+++ feh-1.3.4/feh.1 2008-04-10 11:25:55.000000000 +0200
@@ -258,7 +258,7 @@ it, or will fall back to X methods.
Feh stores the commandline necessary to restore
the background you chose in ~/.fehbg. So to have
feh-set backgrounds restored when you restart X,
-add the line "eval `cat $HOME/.fehbg`" to your
+add the line "`cat $HOME/.fehbg`" to your
X startup script (e.g. ~/.xsession). Note that
you only need to do this for non E window
managers.
feh-1.3.4-man.patch:
--- NEW FILE feh-1.3.4-man.patch ---
--- release/feh.1 2005-07-14 07:59:06.000000000 -0400
+++ working/feh.1 2007-11-28 00:30:42.046020000 -0500
@@ -112,7 +112,7 @@
.br
If FILE doesn't exist, it will be created from the internal filelist at the
end of a viewing session. This is best used to store the results of complex
-sorts (-Spixels for example) for later viewing. Any changes to the internal
+sorts (\-Spixels for example) for later viewing. Any changes to the internal
filelist (such as deleting a file or it being pruned for being unloadable)
will be saved to FILE when feh exits. You can add files to filelists by
specifying them on the commandline when also specifying the list.
@@ -140,7 +140,7 @@
.TP 5
.B --zoom PERCENT
Zooms images by a PERCENT, when in full screen mode or when window geometry
-is fixed. If combined with --auto-zoom, zooming will be limited to the the
+is fixed. If combined with \-\-auto-zoom, zooming will be limited to the the
size.
.TP 5
.B -w, --multiwindow
@@ -180,7 +180,7 @@
"images/captions/foo.jpg.txt"
.TP 5
.B -l, --list
-Don't display images. Analyse them and display an 'ls'-style listing.
+Don't display images. Analyse them and display an 'ls'\-style listing.
Useful in scripts hunt out images of a certain size/resolution/type etc.
.TP 5
.B -L, --customlist FORMAT
@@ -214,7 +214,7 @@
executed by /bin/sh. Use format specifiers to refer to image info. See
FORMAT SPECIFIERS for examples
.br
-Eg. feh -A "mv %f ~/images/%n" *
+Eg. feh \-A "mv %f ~/images/%n" *
.br
In slideshow mode, the next image will be shown after running the action,
in multiwindow mode, the window will be closed.
@@ -296,7 +296,7 @@
.TP 5
.B -4, --menu-button B
Use CTRL+Button B to activate the menu in any mode. Set to 0 to use any
-button. This option is disabled if the -N or --no-menus option is set
+button. This option is disabled if the \-N or \-\-no\-menus option is set
(defaults to 3, usually the right button).
.TP 5
.B -5, --no-menu-ctrl-mask
@@ -363,19 +363,19 @@
\\n newline
.fi
.br
-Eg. feh -A "mv %f ~/images/%n" *
+Eg. feh \-A "mv %f ~/images/%n" *
.SH MONTAGE MODE OPTIONS
.TP 5
.B -X, --ignore-aspect
By default, the montage thumbnails will retain their aspect ratios, while
-fitting in --thumb-width and --thumb-height. This option will force them to
-be the size set by --thumb-width and --thumb-height This will prevent any
+fitting in \-\-thumb\-width and \-\-thumb\-height. This option will force them to
+be the size set by \-\-thumb-width and \-\-thumb-height This will prevent any
whitespace in the final montage
.TP 5
.B -s, --stretch
Normally, if an image is smaller than the specified thumbnail size, it will
not be enlarged. If this option is set, the image will be scaled up to fit
-the thumnail size. (Aspect ratio will be maintained unless --ignore-aspect is
+the thumnail size. (Aspect ratio will be maintained unless \-\-ignore\-aspect is
specified)
.TP 5
.B -y, --thumb-width NUM
@@ -416,7 +416,7 @@
Use FONT to print the information under each thumbnail. FONT should be a
truetype font, resident in the current directory, or in feh's font
directory, and should be defined in the form fontname/size(points). (No
-extension). eg. --font myfont/12
+extension). eg. \-\-font myfont/12
.TP 5
.B --fontpath PATH
Specify PATH as an extra directory in which to search for fonts, can use
@@ -420,7 +420,7 @@
.TP 5
.B --fontpath PATH
Specify PATH as an extra directory in which to search for fonts, can use
-multiple times to add multiple paths, e.g --fontpath /path/a --fontpath
+multiple times to add multiple paths, e.g \-\-fontpath /path/a \-\-fontpath
/path/b.
.TP 5
.B --title-font FONT
@@ -484,7 +484,7 @@
Show popup menu.
.TP 5
.B c, C
-Caption entry mode. If --caption-path has been specified, then this enables
+Caption entry mode. If \-\-caption\-path has been specified, then this enables
caption editing. The caption will turn yellow and be editable, hit enter to
confirm and save the caption, or hit escape to cancel and revert the caption.
.TP 5
@@ -555,8 +555,8 @@
Ctrl+button 1 blurs or sharpens the image (drag left to blur and right to
sharpen). Ctrl+button 2 rotates the image around the center point. Ctrl+
button 3 activates the context-sensitive menu. Buttons can be redefined
-with the -1 through -9 (or --*-button) cmdline flags. All you people
-with million button mice can remove the ctrl mask with the --no-*-ctrl-mask
+with the \-1 through \-9 (or \-\-*\-button) cmdline flags. All you people
+with million button mice can remove the ctrl mask with the \-\-no-*\-ctrl-mask
options.
.SH SUGGESTED USAGE EXAMPLES
Here are some examples of nice option combinations to achieve cool results:
feh-1.3.4-missing-protos.patch:
--- NEW FILE feh-1.3.4-missing-protos.patch ---
diff -up feh-1.3.4/src/md5.c~ feh-1.3.4/src/md5.c
--- feh-1.3.4/src/md5.c~ 2008-04-03 12:04:52.000000000 +0200
+++ feh-1.3.4/src/md5.c 2008-04-03 12:04:52.000000000 +0200
@@ -39,6 +39,7 @@
*/
#include "md5.h"
+#include <string.h>
#ifdef TEST
/*
@@ -46,7 +47,6 @@
* The test program should print out the same values as given in section
* A.5 of RFC 1321, reproduced below.
*/
-#include <string.h>
main()
{
static const char *const test[7] = {
diff -up feh-1.3.4/src/support.c~ feh-1.3.4/src/support.c
--- feh-1.3.4/src/support.c~ 2008-04-03 12:04:32.000000000 +0200
+++ feh-1.3.4/src/support.c 2008-04-03 12:04:32.000000000 +0200
@@ -233,7 +233,7 @@ feh_wm_set_bg(char *fil, Imlib_Image im,
char *path;
path = estrjoin("/", home, ".fehbg", NULL);
if ((fp = fopen(path, "w")) == NULL) {
- wprintf("Can't open %s for write", path);
+ weprintf("Can't open %s for write", path);
} else {
fprintf(fp, "%s\n", fehbg);
fclose(fp);
diff -up feh-1.3.4/src/feh.h~ feh-1.3.4/src/feh.h
--- feh-1.3.4/src/feh.h~ 2008-04-03 11:56:29.000000000 +0200
+++ feh-1.3.4/src/feh.h 2008-04-03 11:56:29.000000000 +0200
@@ -148,7 +148,7 @@ void feh_edit_inplace_lossless_rotate(wi
gib_list * feh_wrap_string(char *text, int wrap_width, int max_height, Imlib_Font fn, gib_style * style);
char *build_caption_filename(feh_file *file);
gib_list * feh_list_jump(gib_list * root, gib_list * l, int direction, int num);
-
+void feh_draw_actions(winwidget w);
/* Imlib stuff */
extern Display *disp;
feh-1.3.4-remove_britney_references.patch:
--- NEW FILE feh-1.3.4-remove_britney_references.patch ---
diff -up feh-1.3.4/src/Makefile.am.foo feh-1.3.4/src/Makefile.am
--- feh-1.3.4/src/Makefile.am.foo 2005-07-18 18:10:51.000000000 +0200
+++ feh-1.3.4/src/Makefile.am 2008-04-10 11:44:51.000000000 +0200
@@ -24,7 +24,7 @@ feh_LDADD = -lX11 -lz -lpng @IML
images_DATA = about.png menubg_default.png menubg_sky.png \
menubg_chrome.png menubg_brushed.png \
menubg_pastel.png menubg_aluminium.png menubg_aqua.png \
-menubg_wood.png menubg_britney.png menubg_black.png
+menubg_wood.png menubg_black.png
imagesdir=$(prefix)/share/feh/images
EXTRA_DIST = $(images_DATA)
diff -up feh-1.3.4/src/options.c.foo feh-1.3.4/src/options.c
--- feh-1.3.4/src/options.c.foo 2005-07-14 13:59:03.000000000 +0200
+++ feh-1.3.4/src/options.c 2008-04-10 11:44:51.000000000 +0200
@@ -1196,7 +1195,7 @@ feh_create_default_config(char *rcfile)
"orange --menu-bg " PREFIX "/share/feh/images/menubg_orange.png\n"
"light --menu-bg " PREFIX "/share/feh/images/menubg_light.png\n"
"black --menu-bg " PREFIX "/share/feh/images/menubg_black.png --menu-style " PREFIX "/share/feh/fonts/black.style\n"
- "britney --menu-bg " PREFIX "/share/feh/images/menubg_britney.png\n");
+ );
fclose(fp);
D_RETURN_(4);
diff -up feh-1.3.4/src/Makefile.in.foo feh-1.3.4/src/Makefile.in
--- feh-1.3.4/src/Makefile.in.foo 2008-04-10 11:45:32.000000000 +0200
+++ feh-1.3.4/src/Makefile.in 2008-04-10 11:45:38.000000000 +0200
@@ -93,7 +93,7 @@ feh_SOURCES = main.c getopt.c getopt1.c
feh_LDADD = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
-images_DATA = about.png menubg_default.png menubg_sky.png menubg_chrome.png menubg_brushed.png menubg_pastel.png menubg_aluminium.png menubg_aqua.png menubg_wood.png menubg_britney.png menubg_black.png
+images_DATA = about.png menubg_default.png menubg_sky.png menubg_chrome.png menubg_brushed.png menubg_pastel.png menubg_aluminium.png menubg_aqua.png menubg_wood.png menubg_black.png
imagesdir = $(prefix)/share/feh/images
feh-1.3.4-svn-fixes.patch:
--- NEW FILE feh-1.3.4-svn-fixes.patch ---
diff -ur feh-1.3.4.orig/ChangeLog feh-1.3.4/ChangeLog
--- feh-1.3.4.orig/ChangeLog 2005-07-23 01:30:37.000000000 +0200
+++ feh-1.3.4/ChangeLog 2008-04-10 11:15:37.000000000 +0200
@@ -1,3 +1,16 @@
+Sat Oct 1 08:05:06 EDT 2005 Richard Lowe <richlowe at richlowe.net>
+ * (imlib.c): Fix double free in feh_http_load_image
+ when using builtin HTTP support.
+Sat Oct 1 07:25:00 EDT 2005 Richard Lowe <richlowe at richlowe.net>
+ * (imlib.c): Fix http grabbing via wget, wget --cache 0 is no longer valid
+ and treats the 0 as another URL. Debian bug #330912.
+ I view this as wget's fault, I'm sure others won't, however.
+ * (imlib.c): Tidy up a minor bit of bothersome logic while there.
+
+Fri Aug 05 17:29:55 BST 2005 Tom Gilbert <tom at linuxbrit.co.uk>
+
+ * Patch from Matthias Drochner to fix compilation on older systems.
+
Sat Jul 23 00:30:09 BST 2005 Tom Gilbert <tom at linuxbrit.co.uk>
* Include the necessary jpegint header to get lossless rotation working in
Only in feh-1.3.4: debian
diff -ur feh-1.3.4.orig/src/imlib.c feh-1.3.4/src/imlib.c
--- feh-1.3.4.orig/src/imlib.c 2005-07-14 13:59:03.000000000 +0200
+++ feh-1.3.4/src/imlib.c 2008-04-10 11:15:37.000000000 +0200
@@ -289,10 +289,6 @@
snprintf(cppid, sizeof(cppid), "%06ld", (long)ppid);
tmpname_timestamper =
estrjoin("", "/tmp/feh_", cppid, "_", basename, NULL);
- }
-
- if (opt.wget_timestamp)
- {
newurl = estrdup(url);
}
else
@@ -548,8 +544,8 @@
}
else
{
- execlp("wget", "wget", "--cache", "0", newurl, "-O", tmpname,
- quiet, (char*) NULL);
+ execlp("wget", "wget", "--cache=off", "-O", tmpname, newurl,
+ quiet, NULL);
}
eprintf("url: exec failed: wget:");
}
@@ -560,8 +556,8 @@
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
{
weprintf("url: wget failed to load URL %s\n", url);
- free(tmpname);
free(newurl);
+ free(tmpname);
D_RETURN(4, NULL);
}
if (opt.wget_timestamp)
@@ -572,10 +568,10 @@
tmpname);
system(cmd);
}
+ free(newurl);
}
}
- free(newurl);
D_RETURN(4, tmpname);
}
diff -ur feh-1.3.4.orig/src/slideshow.c feh-1.3.4/src/slideshow.c
--- feh-1.3.4.orig/src/slideshow.c 2005-07-14 13:59:03.000000000 +0200
+++ feh-1.3.4/src/slideshow.c 2008-04-10 11:15:37.000000000 +0200
@@ -198,7 +198,7 @@
/* Without this, clicking a one-image slideshow reloads it. Not very *
intelligent behaviour :-) */
- if (filelist_len < 2)
+ if (filelist_len < 2 && opt.cycle_once == 0)
D_RETURN_(4);
/* Ok. I do this in such an odd way to ensure that if the last or first *
@@ -353,8 +353,8 @@
D_ENTER(4);
if (action)
{
- D(3, ("Running action %s\n", action));
char *sys;
+ D(3, ("Running action %s\n", action));
sys = feh_printf(action, file);
if (opt.verbose && !opt.list && !opt.customlist)
diff -ur feh-1.3.4.orig/src/support.c feh-1.3.4/src/support.c
--- feh-1.3.4.orig/src/support.c 2008-04-10 11:12:44.000000000 +0200
+++ feh-1.3.4/src/support.c 2008-04-10 11:15:37.000000000 +0200
@@ -162,6 +162,7 @@
/* string for sticking in ~/.fehbg */
char *fehbg = NULL;
char *home;
+ char filbuf[4096];
/* local display to set closedownmode on */
Display *disp2;
@@ -173,6 +174,7 @@
D(3, ("Falling back to XSetRootWindowPixmap\n"));
+ snprintf(filbuf, sizeof(filbuf), "\"%s\"", fil);
if (scaled) {
w = scr->width;
h = scr->height;
@@ -189,7 +191,7 @@
pmap_d1 = XCreatePixmap(disp, root, w, h, depth);
gib_imlib_render_image_on_drawable_at_size(pmap_d1, im, 0, 0, w, h,
1, 0, 1);
- fehbg = estrjoin(" ", "feh --bg-scale", fil, NULL);
+ fehbg = estrjoin(" ", "feh --bg-scale", filbuf, NULL);
} else if (centered) {
XGCValues gcval;
GC gc;
@@ -216,14 +218,14 @@
y = (h - gib_imlib_image_get_height(im)) >> 1;
gib_imlib_render_image_on_drawable(pmap_d1, im, x, y, 1, 0, 0);
XFreeGC(disp, gc);
- fehbg = estrjoin(" ", "feh --bg-center", fil, NULL);
+ fehbg = estrjoin(" ", "feh --bg-center", filbuf, NULL);
} else {
w = gib_imlib_image_get_width(im);
h = gib_imlib_image_get_height(im);
pmap_d1 =
XCreatePixmap(disp, root, w, h, depth);
gib_imlib_render_image_on_drawable(pmap_d1, im, 0, 0, 1, 0, 0);
- fehbg = estrjoin(" ", "feh --bg-tile", fil, NULL);
+ fehbg = estrjoin(" ", "feh --bg-tile", filbuf, NULL);
}
if (fehbg) {
diff -ur feh-1.3.4.orig/src/winwidget.c feh-1.3.4/src/winwidget.c
--- feh-1.3.4.orig/src/winwidget.c 2005-07-14 13:59:03.000000000 +0200
+++ feh-1.3.4/src/winwidget.c 2008-04-10 11:15:37.000000000 +0200
@@ -158,6 +158,7 @@
int h)
{
XSetWindowAttributes attr;
+ XEvent ev;
XClassHint *xch;
MWMHints mwmhints;
Atom prop = None;
@@ -256,6 +257,22 @@
XChangeProperty(disp, ret->win, prop, prop, 32, PropModeReplace,
(unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
}
+ if (ret->full_screen) {
+ Atom prop_fs = XInternAtom(disp, "_NET_WM_STATE_FULLSCREEN", False);
+ Atom prop_state = XInternAtom(disp, "_NET_WM_STATE", False);
+
+ memset(&ev, 0, sizeof(ev));
+ ev.xclient.type = ClientMessage;
+ ev.xclient.message_type = prop_state;
+ ev.xclient.display = disp;
+ ev.xclient.window = ret->win;
+ ev.xclient.format = 32;
+ ev.xclient.data.l[0] = (ret->full_screen ? 1 : 0);
+ ev.xclient.data.l[1] = prop_fs;
+
+ XChangeProperty(disp, ret->win, prop_state, XA_ATOM, 32,
+ PropModeReplace, &prop_fs, 1);
+ }
XSetWMProtocols(disp, ret->win, &wmDeleteWindow, 1);
winwidget_update_title(ret);
@@ -788,6 +805,10 @@
int w,
int h)
{
+ Window ignored_window;
+ XWindowAttributes attributes;
+ int tc_x, tc_y;
+
D_ENTER(4);
if (opt.geom_flags) {
winwid->had_resize = 1;
@@ -800,7 +821,16 @@
winwid->w = (w > scr->width) ? scr->width : w;
winwid->h = (h > scr->height) ? scr->height : h;
}
- XResizeWindow(disp, winwid->win, winwid->w, winwid->h);
+ /* XResizeWindow(disp, winwid->win, winwid->w, winwid->h); */
+ XGetWindowAttributes(disp, winwid->win, &attributes);
+ XTranslateCoordinates(disp, winwid->win, attributes.root,
+ -attributes.border_width - attributes.x,
+ -attributes.border_width - attributes.y,
+ &tc_x, &tc_y, &ignored_window);
+ winwid->x = tc_x;
+ winwid->y = tc_y;
+ XMoveResizeWindow(disp, winwid->win, tc_x, tc_y, winwid->w, winwid->h);
+
winwid->had_resize = 1;
XFlush(disp);
Index: feh.spec
===================================================================
RCS file: /cvs/extras/rpms/feh/F-7/feh.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- feh.spec 31 Aug 2006 22:40:15 -0000 1.9
+++ feh.spec 10 Apr 2008 11:54:24 -0000 1.10
@@ -1,19 +1,24 @@
# No desktop file for feh. It may be a GUI program, but it needs
# file names or it just spits out the help.
-Name: feh
+Name: feh
Version: 1.3.4
-Release: 4%{?dist}
+Release: 8%{?dist}
Summary: Fast command line image viewer using Imlib2
-
Group: Applications/Multimedia
-License: BSD
+License: MIT
URL: http://linuxbrit.co.uk/feh/
-Source0: http://linuxbrit.co.uk/downloads/feh-%{version}.tar.gz
+# This is: http://linuxbrit.co.uk/downloads/feh-%{version}.tar.gz with
+# feh-1.3.4/src/menubg_britney.png (which is non free) removed
+Source0: %{name}-%{version}.tar.gz
+Patch0: feh-1.3.4-missing-protos.patch
+Patch1: feh-1.3.4-remove_britney_references.patch
+Patch2: feh-1.3.4-svn-fixes.patch
+Patch3: feh-1.3.4-man.patch
+Patch4: feh-1.3.4-bz441527.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel
-BuildRequires: libXt-devel
+BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel
+BuildRequires: libXt-devel
%description
feh is a versatile and fast image viewer using imlib2, the
@@ -22,8 +27,14 @@
a slideshow or multiple windows. feh supports the creation of
montages as index prints with many user-configurable options.
+
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
@@ -37,9 +48,11 @@
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
rm -rf $RPM_BUILD_ROOT/usr/doc
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
@@ -47,7 +60,23 @@
%{_datadir}/%{name}
%{_mandir}/man[^3]/*
+
%changelog
+* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.4-8
+- Remove non free menubg_britney.png from sources
+- Apply various fixes from svn
+- Some makeup fixes to the manpage (courtesy of debian)
+- Fix escaping of filenames in "feh --bg-scale" (bz 441527)
+
+* Thu Apr 3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.4-7
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.3.4-6
+- Autorebuild for GCC 4.3
+
+* Mon Aug 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.4-5
+- Update License tag for new Licensing Guidelines compliance
+
* Thu Aug 31 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-4
- Rebuild for Fedora Extras 6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/feh/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Sep 2005 02:33:30 -0000 1.4
+++ sources 10 Apr 2008 11:54:24 -0000 1.5
@@ -1 +1 @@
-3d35ba3d2f0693b019800787f1103891 feh-1.3.4.tar.gz
+41e2c4fd921c680fb1897d5f10f2c502 feh-1.3.4.tar.gz
- Previous message (by thread): rpms/feh/F-8 feh-1.3.4-bz441527.patch, NONE, 1.1 feh-1.3.4-man.patch, NONE, 1.1 feh-1.3.4-missing-protos.patch, NONE, 1.1 feh-1.3.4-remove_britney_references.patch, NONE, 1.1 feh-1.3.4-svn-fixes.patch, NONE, 1.1 feh.spec, 1.10, 1.11 sources, 1.4, 1.5
- Next message (by thread): rpms/roundcubemail/devel roundcubemail.spec,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list