rpms/inkscape/FC-3 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.5, 1.6 sources, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/inkscape/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-3

Modified Files:
	.cvsignore inkscape.spec sources 
Added Files:
	inkscape-0.42-gettext-x86_64.patch 
Log Message:
update -- sync with devel

inkscape-0.42-gettext-x86_64.patch:

--- NEW FILE inkscape-0.42-gettext-x86_64.patch ---
diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure
--- inkscape-0.42-orig/configure	2005-07-25 07:25:35.000000000 +0200
+++ inkscape-0.42/configure	2005-07-29 12:34:14.000000000 +0200
@@ -21344,7 +21344,7 @@
 int
 main ()
 {
-return (int) ngettext ("","", 1)
+return (int)(long) ngettext ("","", 1)
   ;
   return 0;
 }
@@ -21402,7 +21402,7 @@
 int
 main ()
 {
-return (int) dgettext ("","")
+return (int)(long) dgettext ("","")
   ;
   return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2005 04:46:16 -0000	1.5
+++ .cvsignore	29 Jul 2005 13:51:35 -0000	1.6
@@ -1 +1,2 @@
-inkscape-0.41.tar.bz2
+inkscape-0.42.tar.bz2
+inkscape-0.42.tar.bz2.sig


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/inkscape.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- inkscape.spec	10 Feb 2005 04:14:11 -0000	1.5
+++ inkscape.spec	29 Jul 2005 13:51:35 -0000	1.6
@@ -1,12 +1,13 @@
 Name:           inkscape
-Version:        0.41
-Release:        1
-Summary:        A vector-based drawing program using SVG.
+Version:        0.42
+Release:        2%{?dist}
+Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://inkscape.sourceforge.net/
-Source0:        http://download.sourceforge.net/inkscape/inkscape-0.41.tar.bz2
+Source0:        http://download.sourceforge.net/inkscape/inkscape-%{version}.tar.bz2
+Patch0:         inkscape-0.42-gettext-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  atk-devel
@@ -17,6 +18,7 @@
 BuildRequires:  gtkmm24-devel
 BuildRequires:  libart_lgpl-devel >= 2.3.10
 BuildRequires:  libgnomeprintui22-devel >= 2.2.0
+BuildRequires:  gnome-vfs2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libsigc++20-devel
 BuildRequires:  libxml2-devel >= 2.4.24
@@ -43,11 +45,13 @@
 
 It has a relatively modern display engine, giving you finely antialiased
 display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries. 
+C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 
 
 %prep
 %setup -q
+%patch0 -p1 -b .dgettext
+
 
 %build
 %configure                     \
@@ -91,13 +95,44 @@
 %doc AUTHORS COPYING ChangeLog NEWS README HACKING
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
-%{_libdir}/inkscape/
+%{_mandir}/fr/man1/*
 
 
 %changelog
+* Fri Jul 29 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-2
+- Extend ngettext/dgettext patch for x86_64 build.
+
+* Tue Jul 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.42-1
+- update to 0.42 (also fixes #160326)
+- BR gnome-vfs2-devel
+- no files left in %%_libdir/inkscape
+- include French manual page
+- GCC4 patch obsolete, 64-bit patch obsolete, dgettext patch split off
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-7
+- append another 64-bit related patch (dgettext configure check failed)
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-6
+- remove explicit aclocal/autoconf calls in %%build as they create a
+  bad Makefile for FC4/i386, which causes build to fail (#156228),
+  and no comment explains where they were added/needed
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.41-5
+- bump and rebuild as 0.41-4 failed in build system setup
+
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.41-4
+- add patch for gcc4 problems (ignacio, #156228)
+- fix build on 64bit boxes.  sizeof(int) != sizeof(void*)
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.41-3
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Feb 09 2005 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.41-1
 - 0.41.
 - enable python.
@@ -110,7 +145,7 @@
 
 * Thu Nov 11 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.39-0.fdr.2
 - post/postun for new mime system.
-- Dropped redundant BR XFree86-devel. 
+- Dropped redundant BR XFree86-devel.
 
 * Sun Aug 29 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.39-0.fdr.1
 - 0.39.
@@ -128,9 +163,9 @@
 - version upgrade with many improvements and bug fixes
 
 * Fri Mar 19 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.7
-- repsin - sourceforge does not allow reloading files with same name 
+- repsin - sourceforge does not allow reloading files with same name
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.6
-- fix typo in provides 
+- fix typo in provides
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.5
 - add %{release} to provides perl(SpSVG) = %{epoch}:%{version}:%{release} only
 * Tue Mar 16 2004 P Linnell <scribusdocs at atlantictechsolutions.com> 0:0.37.0.fdr.4
@@ -146,10 +181,10 @@
 - enable inkjar
 * Tue Feb 10  2004 P Linnell <scribusdocs at atlantictechsolutions.com>   0:0.37.0.fdr.1
 - pgp'd tarball from inkscape.org
-- clean out the cvs tweaks in spec file 
+- clean out the cvs tweaks in spec file
 - enable gnome-print
 - add the new tutorial files
-- make sure .mo file gets packaged 
+- make sure .mo file gets packaged
 - add provides: perlSVG
 - submit to Fedora QA
 * Sat Feb 7  2004 P Linnell <scribusdocs at atlantictechsolutions.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2005 04:46:16 -0000	1.5
+++ sources	29 Jul 2005 13:51:35 -0000	1.6
@@ -1 +1,2 @@
-9b4bbfaae688127dca4c3d816a42b21a  inkscape-0.41.tar.bz2
+4af587b942647bf9e27861e2238844c8  inkscape-0.42.tar.bz2
+e0a299ff70044fd9a424961bd3ad8c13  inkscape-0.42.tar.bz2.sig