rpms/inkscape/FC-4 inkscape-0.42-gettext-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 inkscape.spec, 1.12, 1.13 sources, 1.5, 1.6
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Fri Jul 29 13:51:37 UTC 2005
- Previous message: devel/common tobuild,1.2151,1.2152
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/extras/rpms/inkscape/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29578/FC-4
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-4/.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-4/inkscape.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- inkscape.spec 31 May 2005 12:56:25 -0000 1.12
+++ inkscape.spec 29 Jul 2005 13:51:35 -0000 1.13
@@ -1,14 +1,13 @@
Name: inkscape
-Version: 0.41
-Release: 7
-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
-Patch0: inkscape-gcc4.patch
-Patch1: inkscape-0.41-64bit.patch
+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
@@ -19,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
@@ -50,8 +50,7 @@
%prep
%setup -q
-%patch0 -p1 -b .gcc4
-%patch1 -p1 -b .64bit
+%patch0 -p1 -b .dgettext
%build
@@ -96,13 +95,23 @@
%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)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/inkscape/FC-4/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
- Previous message: devel/common tobuild,1.2151,1.2152
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list