rpms/xpaint/F-12 import.log, NONE, 1.1 xpaint-2.8.7-graphic.c.patch, NONE, 1.1 xpaint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/xpaint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23702/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xpaint-2.8.7-graphic.c.patch xpaint.spec 
Log Message:
Initial Fedora 10 package.



--- NEW FILE import.log ---
xpaint-2_8_7-1_fc10:F-12:xpaint-2.8.7-1.fc10.src.rpm:1257556527

xpaint-2.8.7-graphic.c.patch:
 graphic.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE xpaint-2.8.7-graphic.c.patch ---
diff -Naur xpaint-2.8.7/graphic.c xpaint-2.8.7-new/graphic.c
--- xpaint-2.8.7/graphic.c	2009-11-03 14:07:41.000000000 -0200
+++ xpaint-2.8.7-new/graphic.c	2009-11-05 06:21:54.000000000 -0200
@@ -802,11 +802,12 @@
 {
     struct paintWindows *cur;
     Widget paint = None;
+    WidgetList wl;
     Boolean flag;
 
     for (cur = head; cur != NULL; cur = cur->next) {
-        XtVaGetValues(cur->paint, XtNdirty, &flag, NULL);
-	if (!flag) {
+	XtVaGetValues(cur->paint, XtNdirty, &flag, XtNmenuwidgets, &wl, NULL);
+	if (!flag && wl) {
 	    paint = cur->paint;
 	    break;
 	}


--- NEW FILE xpaint.spec ---
%bcond_without Xaw3d
%bcond_with neXtaw
%bcond_with rhel

Summary:        An X Window System image editing or paint program
Name:           xpaint
Version:        2.8.7
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.7-graphic.c.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: bison flex imake chrpath
BuildRequires: desktop-file-utils
BuildRequires: libjpeg-devel 
BuildRequires: libpng-devel 
BuildRequires: libtiff-devel
BuildRequires: libSM-devel 
BuildRequires: libXaw-devel 
BuildRequires: libXdmcp-devel 
BuildRequires: libXext-devel 
BuildRequires: libXp-devel
%{?with_Xaw3d:BuildRequires: Xaw3d-devel}
%{?with_neXtaw:BuildRequires: neXtaw-devel}
Requires: cups, emacs, gv, netpbm
# The only way of compiling and linking plugins on the fly.
Requires: %{name}-devel = %{version}-%{release}

%description
XPaint is an X Window System color image bitmap editing program. 
It also supports advanced features, such as image processing
algorithms, scripting and batch jobs. XPaint allows the edition 
of multiple images simultaneously and supports a wide variety of 
image formats, including: GIF, JPG, PNG, PPM, TIFF, XBM, XPM, etc.

Xpaint supports the Xaw3d widget set for a nicer look, 
and offers optional editing features based on programmable filters 
and user defined procedures written as scripts in plain C. 
The package includes a substantial list of examples and 
some support for batch processing.

%package devel
Summary:        Development files for %{name}
Group:          Applications/Multimedia
%if %{without rhel}
BuildArch:      noarch
%endif
# No need to require the main package, since there is no
# library to link against.

%description devel
This package contains development files for %{name}.

%prep
%setup -q
%patch0 -p1 -b .graphic
sed -i -e 's|/lib |/%{_lib} |g' Local.config
sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
sed -i -e 's|/usr/lib|%{_libdir}|g' configure
for f in ChangeLog README; do
    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8
    touch -r $f $f.utf8
    mv $f.utf8 $f
done

%build
sed -i -e "s/\(XCOMM CDEBUGFLAGS =\)/CDEBUGFLAGS = $RPM_OPT_FLAGS\nCXXDEBUGFLAGS = $RPM_OPT_FLAGS/g" Local.config
# this is for debugging, to save the temporary file Imakefile.c
touch fake
ln fake Imakefile.c
%configure

make %{?_smp_mflags} \
     %{?with_Xaw3d:xaw3dg} \
     %{?with_neXtaw:nextaw}

%install
rm -rf %{buildroot}

make \
        DESTDIR=%{buildroot} \
        BINDIR=%{_bindir} \
        LIBDIR=%{_libdir} \
        MANDIR=%{_mandir}/man1 install install.man

# menu entry
desktop-file-install --delete-original                  \
        --vendor ""                                     \
        --dir %{buildroot}%{_datadir}/applications      \
        $RPM_BUILD_DIR/%{name}-%{version}/%{name}.desktop

# icons
mkdir -p %{buildroot}%{_datadir}/pixmaps
cp -a $RPM_BUILD_DIR/%{name}-%{version}/icons/* %{buildroot}%{_datadir}/pixmaps

# rpath
chrpath --delete %{buildroot}%{_bindir}/xpaint

# remove needless symlink to /etc/X11/app-defaults
rm -rf %{buildroot}%{_libdir}/app-defaults

mkdir -p %{buildroot}%{_includedir}
mv %{buildroot}%{_datadir}/%{name}/include %{buildroot}%{_includedir}/%{name}
ln -s ../../include/%{name} %{buildroot}%{_datadir}/%{name}/include

%clean
rm -rf %{buildroot}

%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}

%files
%defattr(-,root,root,-)
%doc ChangeLog GPL-3.0.txt README README.old README.PNG TODO Doc/sample.Xdefaults
%{_bindir}/%{name}
%{_bindir}/imgmerge
%{_bindir}/pdfconcat
%{_datadir}/X11/app-defaults/XPaint*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}*
%{_mandir}/man1/%{name}.1x*

%changelog

* Wed Nov 04 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.7-1
- Updated to 2.8.7
- Changed license to GPLv3+
- Applied patch xpaint-2.8.7-graphic.c.patch

* Mon Nov 02 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.6.1-2
- Moved c_scripts and the include symbolic link to the
  main package, as they are not needed to compile 3th party 
  plugins (if there will ever be a 3th party plugin).

* Tue Oct 27 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.6.1-1
- Updated to 2.8.6.1
- Added devel subpackage as noarch.

* Wed Oct 22 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.5-8
- Updated to 2.8.5
- Using %%configure.
- Removed rpath.

* Wed Oct 14 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.4-7
- Changed license to GPLv3.

* Mon Oct 05 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.3-6
- Removed devel package.

* Sat Oct 03 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.3-5
- Updated to 2.8.3
- Using supplied desktop entry.

* Thu Oct 01 2009 Paulo Roma <roma at lcg.ufrj.br> 2.8.2-5
- Updated to 2.8.2
- New icons.

* Sat Jun 30 2007 Paulo Roma <roma at lcg.ufrj.br> 2.7.8.1-4
- Created devel package.
- Fixed configure.
- Conditionally building with Xaw3d or neXtaw.

* Mon Apr 02 2007 Paulo Roma <roma at lcg.ufrj.br> 2.7.8-4
- Rebuilt for x86_64.
- Moved rm -rf %%{buildroot} from "prep" to "build".
- Fixed rm -rf %%{buildroot}%%{_libdir}/app-defaults
- Removed all .c and .h files.

* Sun Dec 31 2006 Paulo Roma <roma at lcg.ufrj.br> 2.7.8-3
- Included missing build requirements.

* Thu Sep 14 2006 Paulo Roma <roma at lcg.ufrj.br> 2.7.8-1
- Update to 2.7.8
- Changed spec file for Fedora.

* Mon Apr 04 2005 Lenny Cartier <lenny at mandrakesoft.com> 2.7.6-1mdk
- 2.7.6

* Mon Mar 14 2005 Lenny Cartier <lenny at mandrakesoft.com> 2.7.4-1mdk
- 2.7.4

* Mon Jan 31 2005 Lenny Cartier <lenny at mandrakesoft.com> 2.7.3-1mdk
- 2.7.3

* Tue Oct 19 2004 Lenny Cartier <lenny at mandrakesoft.com> 2.7.2-1mdk
- 2.7.2

* Wed Sep 22 2004 Lenny Cartier <lenny at mandrakesoft.com> 2.7.1-1mdk
- 2.7.1

* Fri Aug 20 2004 Thierry Vignaud <tvignaud at mandrakesoft.com> 2.7.0-4mdk
- fix typo in menu entry

* Mon Dec 29 2003 Michael Scherer <misc at mandrake.org> 2.7.0-3mdk 
- fix BuildRequires ( remove lib )
- remove /usr/X11R6/lib/X11/app-defaults link to /etc

* Sun Sep 14 2003 Michael Scherer <scherer.michael at free.fr> 2.7.0-2mdk
- BuildRequires flex
 
* Mon Jun 16 2003 Stew Benedict <sbenedict at mandrakesoft.com> 2.7.0-1mdk
- 2.7.0

* Mon Apr 28 2003 Stew Benedict <sbenedict at mandrakesoft.com> 2.6.9-2mdk
- BuildRequires, distriblint
 
* Fri Apr  4 2003 Stew Benedict <sbenedict at mandrakesoft.com> 2.6.9-1mdk
- 2.6.9, new URL, Source tag 
- some new features finally, add patch1 to fix make install

* Mon Dec 30 2002 Stew Benedict <sbenedict at mandrakesoft.com> 2.6.2-2mdk
- rebuild for new glibc/rpm, add patch1 for errno

* Sat Nov 16 2002 Stew Benedict <sbenedict at mandrakesoft.com> 2.6.2-1mdk
- new version, add installed but unpackaged file, icons->png

* Fri Oct 19 2001 Sebastien Dupont <sdupont at mandrakesoft.com> 2.6.1-2mdk
- License
- srcs permissions
- remove patchs: xpaint-2.4.7-config.patch & xpaint-2.4.7-glibc.patch.

* Sun May 27 2001  Daouda Lo <daouda at mandrakesoft.com> 2.6.1-1mdk
- release 2.6.1
- stop Nono complains.
- cleanups

* Tue Oct 03 2000 Daouda Lo <daouda at mandrakesoft.com> 2.6.0-2mdk
- icons should be transparent
- let spec helper do its jobs
- menu entry in the body of the spec
- more macroz..

* Sun Aug 27 2000 Geoffrey Lee <snailtalk at mandrakesoft.com> 2.6.0-1mdk
- new and shiny version.

* Tue Aug 08 2000 Frederic Lepied <flepied at mandrakesoft.com> 2.4.9-16mdk
- automatically added BuildRequires

* Mon May 15 2000 David BAUDENS <baudens at mandrakesoft.com> 2.4-9-15mdk
- Fix build for i486
- Use %%{_tmppath} for BuildRoot

* Wed May 03 2000 dam's <damien at mandrakesoft.com> 2.4.9-14mdk
- Corrected icons.

* Tue Apr 18 2000 dam's <damien at mandrakesoft.com> 2.4.9-13mdk
- Convert gif icon to xpm.

* Mon Apr 17 2000 dam's <damien at mandrakesoft.com> 2.4.9-12mdk
- Added menu entry.

* Mon Mar 27 2000 dam's <damien at mandrakesoft.com> 2.4.9-11mdk
- Release.

* Tue Nov 02 1999 Pablo Saratxaga <pablo at mandrakesoft.com>
- corrected status of resource file

* Thu May 06 1999 Bernhard Rosenkraenzer <bero at mandrakesoft.com>
- Mandrake adaptions
- handle RPM_OPT_FLAGS

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 8)

* Thu Dec 17 1998 Michael Maher <mike at redhat.com>
- built package for 6.0

* Mon Aug  3 1998 Jeff Johnson <jbj at redhat.com>
- build root.

* Tue Jun 09 1998 Mike Wangsmo <wanger at redhat.com>
- changed the docs from being %%config files.

* Fri May 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Thu Apr 16 1998 Erik Troan <ewt at redhat.com>
- built against libpng 1.0

* Fri Oct 24 1997 Marc Ewing <marc at redhat.com>
- new release
- wmconfig

* Wed Oct 15 1997 Erik Troan <ewt at redhat.com>
- build against new libpng

* Thu Jul 31 1997 Erik Troan <ewt at redhat.com>
- built against glibc

* Tue Mar 25 1997 Erik Troan <ewt at redhat.com>
- "make install.man" places man page in wrong location


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	6 Nov 2009 20:43:31 -0000	1.1
+++ .cvsignore	7 Nov 2009 01:16:01 -0000	1.2
@@ -0,0 +1 @@
+xpaint-2.8.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	6 Nov 2009 20:43:31 -0000	1.1
+++ sources	7 Nov 2009 01:16:01 -0000	1.2
@@ -0,0 +1 @@
+7f41711bcbecad10d45045d52ec24021  xpaint-2.8.7.tar.bz2