rpms/inkscape/F-12 .cvsignore, 1.19, 1.20 import.log, 1.2, 1.3 inkscape-20090925svn-el5.patch, 1.1, 1.2 inkscape.spec, 1.89, 1.90 sources, 1.28, 1.29
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Nov 30 19:22:23 UTC 2009
Author: lkundrak
Update of /cvs/pkgs/rpms/inkscape/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1260/F-12
Modified Files:
.cvsignore import.log inkscape-20090925svn-el5.patch
inkscape.spec sources
Log Message:
Merge stable from devel
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 25 Sep 2009 17:08:18 -0000 1.19
+++ .cvsignore 30 Nov 2009 19:22:22 -0000 1.20
@@ -1 +1 @@
-inkscape.tar.gz
+inkscape-0.47.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 7 Oct 2009 14:06:32 -0000 1.2
+++ import.log 30 Nov 2009 19:22:23 -0000 1.3
@@ -1,2 +1,3 @@
inkscape-0_47-0_16_pre3_20090925svn_fc12:HEAD:inkscape-0.47-0.16.pre3.20090925svn.fc12.src.rpm:1253898265
inkscape-0_47-0_16_pre3_20091017svn_fc13:F-12:inkscape-0.47-0.16.pre3.20091017svn.fc13.src.rpm:1254924277
+inkscape-0_47-1_fc13:F-12:inkscape-0.47-1.fc13.src.rpm:1259608889
inkscape-20090925svn-el5.patch:
configure.ac | 2 +-
src/Makefile.am | 5 +++++
src/extension/internal/cairo-ps-out.cpp | 5 +++++
src/widgets/toolbox.cpp | 2 ++
src/xml/rebase-hrefs.cpp | 14 ++++++++++++--
5 files changed, 25 insertions(+), 3 deletions(-)
Index: inkscape-20090925svn-el5.patch
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape-20090925svn-el5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inkscape-20090925svn-el5.patch 25 Sep 2009 17:08:18 -0000 1.1
+++ inkscape-20090925svn-el5.patch 30 Nov 2009 19:22:23 -0000 1.2
@@ -29,41 +29,6 @@ URIs.
src/xml/rebase-hrefs.cpp | 13 ++++++++++++-
6 files changed, 30 insertions(+), 7 deletions(-)
-diff --git a/autogen.sh b/autogen.sh
-index 6a7c631..5c4e34a 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -15,7 +15,7 @@ TEST_TYPE=-f
- FILE=inkscape.spec.in
-
- AUTOCONF_REQUIRED_VERSION=2.52
--AUTOMAKE_REQUIRED_VERSION=1.10
-+AUTOMAKE_REQUIRED_VERSION=1.9.6
- GLIB_REQUIRED_VERSION=2.0.0
- INTLTOOL_REQUIRED_VERSION=0.17
-
-@@ -86,9 +86,9 @@ fi
-
- echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
- # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
--if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake-1.10
-- ACLOCAL=aclocal-1.10
-+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
-+ ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
- elif (automake --version) < /dev/null > /dev/null 2>&1; then
- # Leave unversioned automake for a last resort: it may be a version earlier
- # than what we require.
-@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
- ACLOCAL=aclocal
- else
- echo
-- echo " You must have automake 1.10 or newer installed to compile $PROJECT."
-+ echo " You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
- DIE=1
- fi
- if test x$AUTOMAKE != x; then
diff --git a/configure.ac b/configure.ac
index fbfa2e5..32ff5a4 100644
--- a/configure.ac
Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/inkscape.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- inkscape.spec 23 Nov 2009 16:27:29 -0000 1.89
+++ inkscape.spec 30 Nov 2009 19:22:23 -0000 1.90
@@ -1,15 +1,12 @@
Name: inkscape
Version: 0.47
-Release: 0.18.pre4.20091101svn%{?dist}
+Release: 1%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
License: GPLv2+
URL: http://inkscape.sourceforge.net/
-#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22548 inkscape
-# tar czf inkscape.tar.gz inkscape
-Source0: %{name}.tar.gz
+Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
Patch0: inkscape-20090410svn-uniconv.patch
Patch4: inkscape-20090410svn-formats.patch
@@ -45,7 +42,7 @@ BuildRequires: perl(XML::Parser)
BuildRequires: perl(ExtUtils::Embed)
BuildRequires: intltool
# A packaging bug in EL-5
-%if 0%{?fedora > 6}%{?rhel > 5}
+%if 0%{?fedora} > 6 || 0%{?rhel} > 5
BuildRequires: popt-devel
%else
BuildRequires: popt
@@ -53,9 +50,6 @@ BuildRequires: popt
BuildRequires: autoconf
BuildRequires: automake
-# Incompatible license
-BuildConflicts: openssl-devel
-
# Disable all for now. TODO: Be smarter
%if 0
Requires: dia
@@ -128,7 +122,7 @@ graphics in W3C standard Scalable Vector
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1 -b .uniconv
%patch4 -p1 -b .formats
%patch5 -p1 -b .el5
@@ -146,7 +140,9 @@ dos2unix -k -q share/extensions/*.py
%build
-sh autogen.sh
+autoreconf -i
+rm intltool*
+intltoolize --automake
%configure \
--with-python \
--with-perl \
@@ -222,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 25 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.47-1
+- Stable release
+
* Mon Nov 23 2009 Adam Jackson <ajax at redhat.com> 0.47-0.18.pre4.20091101svn
- Fix RHEL6 build.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources 1 Nov 2009 15:16:40 -0000 1.28
+++ sources 30 Nov 2009 19:22:23 -0000 1.29
@@ -1 +1 @@
-e92cc0964ccc2c2b190b6c557f8008b3 inkscape.tar.gz
+7b497c8f673e40b05295a29f6e2111f4 inkscape-0.47.tar.bz2
More information about the fedora-extras-commits
mailing list