Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d1103a6638 | ||
|
c005b7ae68 | ||
|
|
304891bd9f | ||
|
|
3eb523952e |
6 changed files with 39 additions and 3220 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1 +1,5 @@
|
|||
xpaint-2.8.19.tar.bz2
|
||||
xpaint-2.9.2.tar.bz2
|
||||
/xpaint-2.9.7.tar.bz2
|
||||
/xpaint-2.9.8.1.tar.bz2
|
||||
/xpaint-2.9.8.3.tar.bz2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
fa50b57e29c2024f825bcc12ab84c29a xpaint-2.8.19.tar.bz2
|
||||
38c643e9e8acec48e98e0abb2e1ce617 xpaint-2.9.8.3.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,423 +0,0 @@
|
|||
diff -rc xpaint-2.8.19/brushOp.c xpaint-2.8.19.1/brushOp.c
|
||||
*** xpaint-2.8.19/brushOp.c 2010-03-06 20:55:25.000000000 +0100
|
||||
--- xpaint-2.8.19.1/brushOp.c 2010-04-17 13:04:17.003999838 +0200
|
||||
***************
|
||||
*** 1246,1252 ****
|
||||
BrushSelect(Widget w)
|
||||
{
|
||||
XtPopup(Global.brushpopup, XtGrabNone);
|
||||
! XMapRaised(XtDisplay(Global.brushpopup), XtWindow(Global.brushpopup));
|
||||
}
|
||||
|
||||
void setBrushIconOnWidget(Widget w)
|
||||
--- 1246,1252 ----
|
||||
BrushSelect(Widget w)
|
||||
{
|
||||
XtPopup(Global.brushpopup, XtGrabNone);
|
||||
! RaiseWindow(XtDisplay(Global.brushpopup), XtWindow(Global.brushpopup));
|
||||
}
|
||||
|
||||
void setBrushIconOnWidget(Widget w)
|
||||
diff -rc xpaint-2.8.19/ChangeLog xpaint-2.8.19.1/ChangeLog
|
||||
*** xpaint-2.8.19/ChangeLog 2010-04-05 21:50:40.000000000 +0200
|
||||
--- xpaint-2.8.19.1/ChangeLog 2010-04-17 13:26:56.167998538 +0200
|
||||
***************
|
||||
*** 1,3 ****
|
||||
--- 1,19 ----
|
||||
+ 2010-04-17 J.-P. Demailly <demailly@fourier.ujf-grenoble.fr>
|
||||
+
|
||||
+ * Version 2.8.19.1 (mostly cosmetic changes)
|
||||
+
|
||||
+ * fileBrowser.c : added "ongoing" mode in File Browser (widget no
|
||||
+ longer closes when opening an image, allowing to browse files
|
||||
+ continuously). Performed a substantial code clean-up as well.
|
||||
+
|
||||
+ * operation.c, graphic.c : menu improvements; one can now open an image
|
||||
+ from any canvas window.
|
||||
+
|
||||
+ * misc.c : added RaiseWindow() routine to comply better with ewmh
|
||||
+ specifications. XMapRaised() replaced by RaiseWindow() throughout.
|
||||
+
|
||||
+ * "snapshot" replaced by "screenshot" throughout.
|
||||
+
|
||||
2010-04-05 J.-P. Demailly <demailly@fourier.ujf-grenoble.fr>
|
||||
|
||||
* Version 2.8.19
|
||||
diff -rc xpaint-2.8.19/chroma.c xpaint-2.8.19.1/chroma.c
|
||||
*** xpaint-2.8.19/chroma.c 2010-02-17 18:19:30.000000000 +0100
|
||||
--- xpaint-2.8.19.1/chroma.c 2010-04-17 13:10:06.565999447 +0200
|
||||
***************
|
||||
*** 304,310 ****
|
||||
XtVaSetValues(l->shell, XtNcolormap, map->cmap, NULL);
|
||||
}
|
||||
XtPopup(l->shell, XtGrabNone);
|
||||
! XMapRaised(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
--- 304,310 ----
|
||||
XtVaSetValues(l->shell, XtNcolormap, map->cmap, NULL);
|
||||
}
|
||||
XtPopup(l->shell, XtGrabNone);
|
||||
! RaiseWindow(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
diff -rc xpaint-2.8.19/fatBitsEdit.c xpaint-2.8.19.1/fatBitsEdit.c
|
||||
*** xpaint-2.8.19/fatBitsEdit.c 2010-04-05 16:43:00.000000000 +0200
|
||||
--- xpaint-2.8.19.1/fatBitsEdit.c 2010-04-17 13:11:13.311999977 +0200
|
||||
***************
|
||||
*** 586,592 ****
|
||||
|
||||
XtVaGetValues(w, XtNx, &x, XtNy, &y, NULL);
|
||||
if (abs(event->time-prev_time) < 300)
|
||||
! XMapRaised(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
prev_time = event->time;
|
||||
|
||||
l->offX = event->x;
|
||||
--- 586,592 ----
|
||||
|
||||
XtVaGetValues(w, XtNx, &x, XtNy, &y, NULL);
|
||||
if (abs(event->time-prev_time) < 300)
|
||||
! RaiseWindow(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
prev_time = event->time;
|
||||
|
||||
l->offX = event->x;
|
||||
***************
|
||||
*** 826,832 ****
|
||||
for (l = head; l != NULL && l->paint != paint; l = l->next);
|
||||
|
||||
if (l != NULL) {
|
||||
! XMapRaised(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
return;
|
||||
}
|
||||
/* Construct a new fatbits popup */
|
||||
--- 826,832 ----
|
||||
for (l = head; l != NULL && l->paint != paint; l = l->next);
|
||||
|
||||
if (l != NULL) {
|
||||
! RaiseWindow(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
return;
|
||||
}
|
||||
/* Construct a new fatbits popup */
|
||||
diff -rc xpaint-2.8.19/fontSelect.c xpaint-2.8.19.1/fontSelect.c
|
||||
*** xpaint-2.8.19/fontSelect.c 2010-04-17 13:59:56.832000354 +0200
|
||||
--- xpaint-2.8.19.1/fontSelect.c 2010-04-17 13:02:57.434256246 +0200
|
||||
***************
|
||||
*** 1091,1097 ****
|
||||
|
||||
if (shell != None) {
|
||||
XtPopup(shell, XtGrabNone);
|
||||
! XMapRaised(XtDisplay(shell), XtWindow(shell));
|
||||
XtSetMinSizeHints(shell, 360, 480);
|
||||
return;
|
||||
}
|
||||
--- 1091,1097 ----
|
||||
|
||||
if (shell != None) {
|
||||
XtPopup(shell, XtGrabNone);
|
||||
! RaiseWindow(XtDisplay(shell), XtWindow(shell));
|
||||
XtSetMinSizeHints(shell, 360, 480);
|
||||
return;
|
||||
}
|
||||
diff -rc xpaint-2.8.19/graphic.c xpaint-2.8.19.1/graphic.c
|
||||
*** xpaint-2.8.19/graphic.c 2010-04-17 13:59:56.835003566 +0200
|
||||
--- xpaint-2.8.19.1/graphic.c 2010-04-17 13:50:03.439249821 +0200
|
||||
***************
|
||||
*** 4512,4520 ****
|
||||
static void
|
||||
ToolSelectCallback(Widget w, XtPointer shell, XtPointer junk2)
|
||||
{
|
||||
Global.canvas = (Widget) shell;
|
||||
! XtVaSetValues(Global.back, XtNsensitive, True, NULL);
|
||||
! XMapRaised(XtDisplay(Global.toplevel), XtWindow(Global.toplevel));
|
||||
}
|
||||
|
||||
static void
|
||||
--- 4512,4521 ----
|
||||
static void
|
||||
ToolSelectCallback(Widget w, XtPointer shell, XtPointer junk2)
|
||||
{
|
||||
+ Display *dpy = XtDisplay(Global.toplevel);
|
||||
Global.canvas = (Widget) shell;
|
||||
! XtVaSetValues(Global.back, XtNsensitive, True, NULL);
|
||||
! RaiseWindow(dpy, XtWindow(Global.toplevel));
|
||||
}
|
||||
|
||||
static void
|
||||
***************
|
||||
*** 4524,4529 ****
|
||||
--- 4525,4533 ----
|
||||
PatternEdit(info->paint,
|
||||
info->pixels, info->patterns, (void *)info->rcInfo->brushes,
|
||||
info->npixels, info->npatterns, info->rcInfo->nbrushes);
|
||||
+ if (Global.patternshell)
|
||||
+ RaiseWindow(XtDisplay(Global.patternshell),
|
||||
+ XtWindow(Global.patternshell));
|
||||
}
|
||||
|
||||
#if 0
|
||||
***************
|
||||
*** 4711,4718 ****
|
||||
wlist[W_LINE_WIDTHS+i] = popupLineMenu[j+1].widget;
|
||||
wlist[W_TOPMENU+W_LINE_WIDTHS+i] = lineMenu[j].widget;
|
||||
}
|
||||
! for (i=0; i<=10; i++) {
|
||||
! j = i+(i==10);
|
||||
wlist[W_FONT_DESCR+i] = popupTextMenu[j+1].widget;
|
||||
wlist[W_TOPMENU+W_FONT_DESCR+i] = textMenu[j].widget;
|
||||
}
|
||||
--- 4715,4722 ----
|
||||
wlist[W_LINE_WIDTHS+i] = popupLineMenu[j+1].widget;
|
||||
wlist[W_TOPMENU+W_LINE_WIDTHS+i] = lineMenu[j].widget;
|
||||
}
|
||||
! for (i=0; i<=NUMBER_PREDEF_FONTS; i++) {
|
||||
! j = i+(i==NUMBER_PREDEF_FONTS);
|
||||
wlist[W_FONT_DESCR+i] = popupTextMenu[j+1].widget;
|
||||
wlist[W_TOPMENU+W_FONT_DESCR+i] = textMenu[j].widget;
|
||||
}
|
||||
***************
|
||||
*** 4738,4744 ****
|
||||
XtVaGetValues(head->paint, XtNlineWidth, &i, NULL);
|
||||
for (j=0; j<=5; j++)
|
||||
if (IsItemChecked(wlist[W_LINE_WIDTHS+j])) break;
|
||||
! for (k=0; k<=NUMBER_PREDEF_FONTS; k++)
|
||||
if (IsItemChecked(wlist[W_FONT_DESCR+k])) break;
|
||||
l = IsItemChecked(wlist[W_SELECTOR_GRID]);
|
||||
m = IsItemChecked(wlist[W_SELECTOR_SNAP]);
|
||||
--- 4742,4748 ----
|
||||
XtVaGetValues(head->paint, XtNlineWidth, &i, NULL);
|
||||
for (j=0; j<=5; j++)
|
||||
if (IsItemChecked(wlist[W_LINE_WIDTHS+j])) break;
|
||||
! for (k=0; k<NUMBER_PREDEF_FONTS; k++)
|
||||
if (IsItemChecked(wlist[W_FONT_DESCR+k])) break;
|
||||
l = IsItemChecked(wlist[W_SELECTOR_GRID]);
|
||||
m = IsItemChecked(wlist[W_SELECTOR_SNAP]);
|
||||
diff -rc xpaint-2.8.19/help.c xpaint-2.8.19.1/help.c
|
||||
*** xpaint-2.8.19/help.c 2010-04-05 16:45:45.000000000 +0200
|
||||
--- xpaint-2.8.19.1/help.c 2010-04-17 13:11:29.952250062 +0200
|
||||
***************
|
||||
*** 532,538 ****
|
||||
StoreName(l->shell, str);
|
||||
|
||||
display(l, cur);
|
||||
! XMapRaised(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
XtSetMinSizeHints(l->shell, 466, 160);
|
||||
}
|
||||
|
||||
--- 532,538 ----
|
||||
StoreName(l->shell, str);
|
||||
|
||||
display(l, cur);
|
||||
! RaiseWindow(XtDisplay(l->shell), XtWindow(l->shell));
|
||||
XtSetMinSizeHints(l->shell, 466, 160);
|
||||
}
|
||||
|
||||
diff -rc xpaint-2.8.19/main.c xpaint-2.8.19.1/main.c
|
||||
*** xpaint-2.8.19/main.c 2010-04-17 13:59:56.835998119 +0200
|
||||
--- xpaint-2.8.19.1/main.c 2010-04-17 13:12:37.073999936 +0200
|
||||
***************
|
||||
*** 1101,1107 ****
|
||||
XtDispatchEvent(&event);
|
||||
if (appInfo.magnifier && argc==1 && magnifier_closing_down) {
|
||||
XtVaSetValues(toplevel, XtNmappedWhenManaged, True, NULL);
|
||||
! XMapRaised(dpy, XtWindow(toplevel));
|
||||
appInfo.magnifier = 0;
|
||||
}
|
||||
}
|
||||
--- 1101,1107 ----
|
||||
XtDispatchEvent(&event);
|
||||
if (appInfo.magnifier && argc==1 && magnifier_closing_down) {
|
||||
XtVaSetValues(toplevel, XtNmappedWhenManaged, True, NULL);
|
||||
! RaiseWindow(dpy, XtWindow(toplevel));
|
||||
appInfo.magnifier = 0;
|
||||
}
|
||||
}
|
||||
diff -rc xpaint-2.8.19/misc.c xpaint-2.8.19.1/misc.c
|
||||
*** xpaint-2.8.19/misc.c 2010-02-18 18:32:20.000000000 +0100
|
||||
--- xpaint-2.8.19.1/misc.c 2010-04-17 13:07:17.453250051 +0200
|
||||
***************
|
||||
*** 137,142 ****
|
||||
--- 137,160 ----
|
||||
return w;
|
||||
}
|
||||
|
||||
+ RaiseWindow(Display *dpy, Window win)
|
||||
+ {
|
||||
+ XEvent event;
|
||||
+ int j;
|
||||
+ long mask = SubstructureRedirectMask | SubstructureNotifyMask;
|
||||
+ char *msg = "_NET_ACTIVE_WINDOW";
|
||||
+
|
||||
+ event.xclient.type = ClientMessage;
|
||||
+ event.xclient.serial = 0;
|
||||
+ event.xclient.send_event = True;
|
||||
+ event.xclient.message_type = XInternAtom(dpy, msg, False);
|
||||
+ event.xclient.window = win;
|
||||
+ event.xclient.format = 32;
|
||||
+ for (j=0; j<=4; j++) event.xclient.data.l[j] = 0;
|
||||
+ XSendEvent(dpy, DefaultRootWindow(dpy), False, mask, &event);
|
||||
+ XMapRaised(dpy, win);
|
||||
+ }
|
||||
+
|
||||
void
|
||||
SetIBeamCursor(Widget w)
|
||||
{
|
||||
diff -rc xpaint-2.8.19/misc.h xpaint-2.8.19.1/misc.h
|
||||
*** xpaint-2.8.19/misc.h 2010-04-17 13:59:56.835998119 +0200
|
||||
--- xpaint-2.8.19.1/misc.h 2010-04-17 13:08:05.244249870 +0200
|
||||
***************
|
||||
*** 147,152 ****
|
||||
--- 147,153 ----
|
||||
extern int privateXErrorHandler(Display *dpy, XErrorEvent *myerr);
|
||||
extern Widget GetToplevel(Widget w);
|
||||
extern Widget GetShell(Widget w);
|
||||
+ extern void RaiseWindow(Display *dpy, Window win);
|
||||
extern void SetIBeamCursor(Widget w);
|
||||
extern void SetCrossHairCursor(Widget w);
|
||||
extern void SetPencilCursor(Widget w);
|
||||
diff -rc xpaint-2.8.19/operation.c xpaint-2.8.19.1/operation.c
|
||||
*** xpaint-2.8.19/operation.c 2010-04-17 13:59:56.836998049 +0200
|
||||
--- xpaint-2.8.19.1/operation.c 2010-04-17 13:08:37.805249865 +0200
|
||||
***************
|
||||
*** 1387,1394 ****
|
||||
static void
|
||||
switchtoCanvasCallback(Widget w, XtPointer junk, XEvent * event, Boolean * flg)
|
||||
{
|
||||
! if (Global.canvas && event->type == ButtonRelease)
|
||||
! XMapRaised(XtDisplay(Global.canvas), XtWindow(Global.canvas));
|
||||
}
|
||||
|
||||
void
|
||||
--- 1387,1394 ----
|
||||
static void
|
||||
switchtoCanvasCallback(Widget w, XtPointer junk, XEvent * event, Boolean * flg)
|
||||
{
|
||||
! if (Global.canvas && event->type == ButtonRelease)
|
||||
! RaiseWindow(XtDisplay(Global.canvas), XtWindow(Global.canvas));
|
||||
}
|
||||
|
||||
void
|
||||
diff -rc xpaint-2.8.19/pattern.c xpaint-2.8.19.1/pattern.c
|
||||
*** xpaint-2.8.19/pattern.c 2010-04-17 13:59:56.837997839 +0200
|
||||
--- xpaint-2.8.19.1/pattern.c 2010-04-17 13:10:43.887000137 +0200
|
||||
***************
|
||||
*** 1222,1228 ****
|
||||
if (event->type != ButtonRelease);
|
||||
if (w == l->icon) {
|
||||
if (l->paint)
|
||||
! XMapRaised(XtDisplay(l->paint), XtWindow(GetShell(l->paint)));
|
||||
return;
|
||||
}
|
||||
l->active = w;
|
||||
--- 1222,1228 ----
|
||||
if (event->type != ButtonRelease);
|
||||
if (w == l->icon) {
|
||||
if (l->paint)
|
||||
! RaiseWindow(XtDisplay(l->paint), XtWindow(GetShell(l->paint)));
|
||||
return;
|
||||
}
|
||||
l->active = w;
|
||||
***************
|
||||
*** 1682,1688 ****
|
||||
initViews(info);
|
||||
XMapWindow(dpy, XtWindow(info->r_arrow));
|
||||
XUnmapWindow(dpy, XtWindow(info->g_arrow));
|
||||
! XMapRaised(dpy, XtWindow(Global.patternshell));
|
||||
return;
|
||||
}
|
||||
StateSetBusyWatch(True);
|
||||
--- 1682,1688 ----
|
||||
initViews(info);
|
||||
XMapWindow(dpy, XtWindow(info->r_arrow));
|
||||
XUnmapWindow(dpy, XtWindow(info->g_arrow));
|
||||
! RaiseWindow(dpy, XtWindow(Global.patternshell));
|
||||
return;
|
||||
}
|
||||
StateSetBusyWatch(True);
|
||||
diff -rc xpaint-2.8.19/print.c xpaint-2.8.19.1/print.c
|
||||
*** xpaint-2.8.19/print.c 2010-03-31 05:53:58.000000000 +0200
|
||||
--- xpaint-2.8.19.1/print.c 2010-04-17 13:11:56.257249698 +0200
|
||||
***************
|
||||
*** 1054,1060 ****
|
||||
|
||||
if (printinfo->shell) {
|
||||
if (printinfo->paintwidget == (PaintWidget)paintArg) {
|
||||
! XMapRaised(dpy, XtWindow(printinfo->shell));
|
||||
return;
|
||||
} else
|
||||
XtDestroyWidget(printinfo->shell);
|
||||
--- 1054,1060 ----
|
||||
|
||||
if (printinfo->shell) {
|
||||
if (printinfo->paintwidget == (PaintWidget)paintArg) {
|
||||
! RaiseWindow(dpy, XtWindow(printinfo->shell));
|
||||
return;
|
||||
} else
|
||||
XtDestroyWidget(printinfo->shell);
|
||||
***************
|
||||
*** 1841,1847 ****
|
||||
}
|
||||
if (externinfo->shell) {
|
||||
if (externinfo->paintwidget == (PaintWidget)paintArg) {
|
||||
! XMapRaised(dpy, XtWindow(externinfo->shell));
|
||||
return;
|
||||
} else
|
||||
XtDestroyWidget(externinfo->shell);
|
||||
--- 1841,1847 ----
|
||||
}
|
||||
if (externinfo->shell) {
|
||||
if (externinfo->paintwidget == (PaintWidget)paintArg) {
|
||||
! RaiseWindow(dpy, XtWindow(externinfo->shell));
|
||||
return;
|
||||
} else
|
||||
XtDestroyWidget(externinfo->shell);
|
||||
diff -rc xpaint-2.8.19/protocol.c xpaint-2.8.19.1/protocol.c
|
||||
*** xpaint-2.8.19/protocol.c 2009-10-01 16:21:52.000000000 +0200
|
||||
--- xpaint-2.8.19.1/protocol.c 2010-04-17 13:09:14.781000149 +0200
|
||||
***************
|
||||
*** 217,223 ****
|
||||
CopyFromParent, valuemask, &attributes);
|
||||
|
||||
if (DO_MAP(l))
|
||||
! XMapRaised(l->dpy, l->win);
|
||||
}
|
||||
|
||||
|
||||
--- 217,223 ----
|
||||
CopyFromParent, valuemask, &attributes);
|
||||
|
||||
if (DO_MAP(l))
|
||||
! RaiseWindow(l->dpy, l->win);
|
||||
}
|
||||
|
||||
|
||||
***************
|
||||
*** 301,313 ****
|
||||
}
|
||||
if (cur->watchCount == 1) {
|
||||
if (isWatch) {
|
||||
! XMapRaised(cur->dpy, cur->win);
|
||||
XDefineCursor(cur->dpy, cur->win, watchCursor);
|
||||
doFlush = True;
|
||||
}
|
||||
} else if (cur->computingCount == 1) {
|
||||
if (!isWatch) {
|
||||
! XMapRaised(cur->dpy, cur->win);
|
||||
XDefineCursor(cur->dpy, cur->win, cursorInfo[currentCursor].cursor);
|
||||
doFlush = True;
|
||||
}
|
||||
--- 301,313 ----
|
||||
}
|
||||
if (cur->watchCount == 1) {
|
||||
if (isWatch) {
|
||||
! RaiseWindow(cur->dpy, cur->win);
|
||||
XDefineCursor(cur->dpy, cur->win, watchCursor);
|
||||
doFlush = True;
|
||||
}
|
||||
} else if (cur->computingCount == 1) {
|
||||
if (!isWatch) {
|
||||
! RaiseWindow(cur->dpy, cur->win);
|
||||
XDefineCursor(cur->dpy, cur->win, cursorInfo[currentCursor].cursor);
|
||||
doFlush = True;
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
43
xpaint.spec
43
xpaint.spec
|
|
@ -4,20 +4,18 @@
|
|||
|
||||
Summary: An X Window System image editing or paint program
|
||||
Name: xpaint
|
||||
Version: 2.8.19
|
||||
Version: 2.9.8.3
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Multimedia
|
||||
URL: http://sourceforge.net/projects/sf-xpaint
|
||||
Source0: http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
|
||||
Patch0: xpaint-2.8.19-minor_fixes.patch
|
||||
Patch1: xpaint-2.8.19-small-improvements.patch
|
||||
Patch2: xpaint-2.8.19-ewmh-minor-fixes.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: bison flex imake chrpath
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: openjpeg-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libSM-devel
|
||||
|
|
@ -29,6 +27,9 @@ BuildRequires: libXft-devel
|
|||
BuildRequires: Xaw3d-devel
|
||||
%{?with_neXtaw:BuildRequires: neXtaw-devel}
|
||||
Requires: cups, gv, netpbm, psutils
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
|
||||
# The only way of compiling and linking plugins on the fly.
|
||||
Obsoletes: %{name}-devel < %{version}-%{release}
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
|
|
@ -55,9 +56,6 @@ some support for batch processing.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
sed -i -e 's|-lXext|-lXext -lfontconfig|g' Local.config
|
||||
sed -i -e 's|/lib |/%{_lib} |g' Local.config
|
||||
sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
|
||||
|
|
@ -105,7 +103,7 @@ cp -a $RPM_BUILD_DIR/%{name}-%{version}/icons/* %{buildroot}%{_datadir}/pixmaps
|
|||
# libs
|
||||
%if %{with xaw3dxft}
|
||||
mkdir -p %{buildroot}%{_libdir}
|
||||
cp -a $RPM_BUILD_DIR/%{name}-%{version}/xaw3dxft/libXaw3dxft.* %{buildroot}%{_libdir}
|
||||
cp -a $RPM_BUILD_DIR/%{name}-%{version}/Xaw3dxft/libXaw3dxft.* %{buildroot}%{_libdir}
|
||||
%endif
|
||||
|
||||
# rpath
|
||||
|
|
@ -118,6 +116,10 @@ mkdir -p %{buildroot}%{_includedir}
|
|||
mv %{buildroot}%{_datadir}/%{name}/include %{buildroot}%{_includedir}/%{name}
|
||||
ln -s ../../include/%{name} %{buildroot}%{_datadir}/%{name}/include
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
|
@ -132,6 +134,7 @@ rm -rf %{buildroot}
|
|||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/pixmaps/%{name}*
|
||||
%{_datadir}/pixmaps/XPaintIcon*.png
|
||||
%{_mandir}/man1/%{name}.1x*
|
||||
%if %{with xaw3dxft}
|
||||
%{_libdir}/libXaw3dxft.*
|
||||
|
|
@ -139,6 +142,28 @@ rm -rf %{buildroot}
|
|||
|
||||
%changelog
|
||||
|
||||
* Tue Nov 15 2011 Paulo Roma <roma@lcg.ufrj.br> 2.9.8.3-1
|
||||
- Updated to 2.9.8.3
|
||||
|
||||
* Mon Jun 27 2011 Paulo Roma <roma@lcg.ufrj.br> 2.9.8.2-1
|
||||
- Updated to 2.9.8.2
|
||||
- Added new png files.
|
||||
|
||||
* Fri Dec 24 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.8.1-1
|
||||
- Updated to 2.9.8.1
|
||||
- Removed deprecated gcc 4.5 patch.
|
||||
|
||||
* Sat Nov 07 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.8-1
|
||||
- Update to 2.9.8
|
||||
- Patched for gcc 4.5
|
||||
|
||||
* Sat Nov 06 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.7-1
|
||||
- Update to 2.9.7
|
||||
|
||||
* Sun Aug 01 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.2-1
|
||||
- Update to 2.9.2
|
||||
- Added BR openjpeg-devel.
|
||||
|
||||
* Mon Mar 08 2010 Paulo Roma <roma@lcg.ufrj.br> 2.8.19-1
|
||||
- Update to 2.8.19
|
||||
- BRs: xaw/xaw3d are optional.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue