[javapackages] Fix "TypeError: encode() takes no keyword arguments" (python 2.6)
by Michal Srb
commit 984c74b37dc651b69adf4648ecf735ebe5d61cf2
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Sep 4 13:39:16 2014 +0200
Fix "TypeError: encode() takes no keyword arguments" (python 2.6)
From documentation for str.decode():
"Changed in version 2.7: Support for keyword arguments added."
java-utils/pom_editor.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py
index 166e774..7253acd 100644
--- a/java-utils/pom_editor.py
+++ b/java-utils/pom_editor.py
@@ -356,7 +356,7 @@ class Pom(XmlFile):
with io.open(self.xmlpath, encoding="UTF-8") as pomfile:
pom = re.sub(r'\<\s*project\s*\>',
u'<project {ns}>'.format(ns=self.XMLNS), pomfile.read())
- self.root = etree.fromstring(pom.encode(encoding="utf-8"))
+ self.root = etree.fromstring(pom.encode("utf-8"))
@classmethod
def create_artifact(cls, *args, **kwargs):
9 years, 8 months
[tycho] Include eclipse features dir in custom resolver
by Mikolaj Izdebski
commit c7cad093f36d5a27e3a7ab4f89ceea5a41b5cdfe
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Sep 4 12:01:43 2014 +0200
Include eclipse features dir in custom resolver
tycho-use-custom-resolver.patch | 2 +-
tycho.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index bfd05ef..4e88e58 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -543,7 +543,7 @@ index 255df24..554702d 100644
+
+ String is64 = System.getProperty("os.arch").contains("64") ? "64" : "";
+ // Locations for all OSGi bundles
-+ final String[] locations = new String[] { "usr/lib" + is64 + "/eclipse/plugins",
++ final String[] locations = new String[] { "usr/lib" + is64 + "/eclipse/plugins", "usr/lib" + is64 + "/eclipse/features",
+ "usr/share/eclipse/dropins/", "usr/lib" + is64 + "/eclipse/dropins/", "usr/share/java/",
+ "usr/lib/java/" };
+
diff --git a/tycho.spec b/tycho.spec
index b5ec51a..8d985f4 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -368,6 +368,9 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
%{_javadocdir}/%{name}
%changelog
+* Wed Sep 03 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-5
+- Include eclipse features dir in custom resolver
+
* Wed Sep 03 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-4
- fedoraproject-p2: Do not regenerate IU metadata on every query.
9 years, 8 months
[velocity] Require hsqldb-lib instead of hsqldb
by Mikolaj Izdebski
commit 0e0a82bc39b0d6c8decc05d0bd48beac7351f667
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Sep 4 08:01:20 2014 +0200
Require hsqldb-lib instead of hsqldb
velocity.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/velocity.spec b/velocity.spec
index 4a57384..725050e 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -30,7 +30,7 @@
Name: velocity
Version: 1.7
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 0
Summary: Java-based template engine
License: ASL 2.0
@@ -49,7 +49,7 @@ Requires: apache-commons-lang
Requires: servlet3
Requires: jakarta-oro
Requires: junit
-Requires: hsqldb
+Requires: hsqldb-lib
Requires: jaxen
Requires: jdom
Requires: bcel
@@ -60,7 +60,7 @@ BuildRequires: ant
BuildRequires: antlr
BuildRequires: junit
BuildRequires: ant-junit
-BuildRequires: hsqldb
+BuildRequires: hsqldb-lib
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-lang
@@ -217,6 +217,9 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/%{name}
%changelog
+* Thu Sep 4 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.7-15
+- Require hsqldb-lib instead of hsqldb
+
* Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.7-14
- Apply patch for log4j 1.2.17
9 years, 8 months
[plexus-archiver] Add patch for extracting symbolic links
by Mikolaj Izdebski
commit 06ee4bbd462351b8e728e81c6a36bad8d4ac8893
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Sep 4 06:09:04 2014 +0200
Add patch for extracting symbolic links
0001-Fix-PLXCOMP-113-and-PLXCOMP-64.patch | 197 +++++++++++++++++++++++++++++
plexus-archiver.spec | 44 ++-----
2 files changed, 207 insertions(+), 34 deletions(-)
---
diff --git a/0001-Fix-PLXCOMP-113-and-PLXCOMP-64.patch b/0001-Fix-PLXCOMP-113-and-PLXCOMP-64.patch
new file mode 100644
index 0000000..df15619
--- /dev/null
+++ b/0001-Fix-PLXCOMP-113-and-PLXCOMP-64.patch
@@ -0,0 +1,197 @@
+From cf249e1a6a167689b685bbb89650345d1ed42977 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber(a)redhat.com>
+Date: Mon, 25 Aug 2014 10:45:11 -0400
+Subject: [PATCH] Fix PLXCOMP-113 and PLXCOMP-64.
+
+Zip and Tar Unarchivers should support POSIX symbolic links.
+---
+ .../org/codehaus/plexus/archiver/tar/TarEntry.java | 11 +++++
+ .../plexus/archiver/tar/TarUnArchiver.java | 2 +-
+ .../plexus/archiver/zip/AbstractZipUnArchiver.java | 57 +++++++++++++++-------
+ .../org/codehaus/plexus/archiver/zip/ZipEntry.java | 9 ++++
+ 4 files changed, 61 insertions(+), 18 deletions(-)
+
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarEntry.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarEntry.java
+index 78156e4..8792ff7 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarEntry.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarEntry.java
+@@ -636,6 +636,17 @@ public class TarEntry
+ }
+
+ /**
++ * Return whether or not this entry represents a symbolic link.
++ *
++ * @return True if this entry is a symbolic link.
++ * @since 2.4.5
++ */
++ public boolean isSymbolicLink()
++ {
++ return this.linkFlag == LF_SYMLINK;
++ }
++
++ /**
+ * If this entry represents a file, and the file is a directory, return
+ * an array of TarEntries for this entry's children.
+ *
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+index 3933ce1..16d1cbf 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+@@ -91,7 +91,7 @@ public class TarUnArchiver
+ while ( ( te = tis.getNextEntry() ) != null )
+ {
+ extractFile( getSourceFile(), getDestDirectory(), tis, te.getName(), te.getModTime(),
+- te.isDirectory(), te.getMode() != 0 ? te.getMode() : null);
++ te.isDirectory(), te.getMode() != 0 ? te.getMode() : null, te.isSymbolicLink(), te.getLinkName());
+ }
+ getLogger().debug( "expand complete" );
+
+diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java
+index fb8759e..0e4c54c 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java
+@@ -17,15 +17,21 @@ package org.codehaus.plexus.archiver.zip;
+ * limitations under the License.
+ */
+
++import java.io.BufferedReader;
+ import java.io.File;
+ import java.io.FileNotFoundException;
+ import java.io.FileOutputStream;
+ import java.io.IOException;
+ import java.io.InputStream;
++import java.io.InputStreamReader;
+ import java.io.OutputStream;
+ import java.net.URL;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
+ import java.util.Date;
+ import java.util.Enumeration;
++
+ import org.codehaus.plexus.archiver.AbstractUnArchiver;
+ import org.codehaus.plexus.archiver.ArchiveFilterException;
+ import org.codehaus.plexus.archiver.ArchiverException;
+@@ -97,7 +103,6 @@ public abstract class AbstractZipUnArchiver
+ {
+ return !zipEntry.isDirectory();
+ }
+-
+ public InputStream getContents()
+ throws IOException
+ {
+@@ -147,7 +152,7 @@ public abstract class AbstractZipUnArchiver
+ }
+ InputStream in = zf.getInputStream( ze );
+ extractFileIfIncluded( getSourceFile(), getDestDirectory(), in, ze.getName(),
+- new Date( ze.getTime() ), ze.isDirectory(), ze.getUnixMode()!= 0 ? ze.getUnixMode() : null );
++ new Date( ze.getTime() ), ze.isDirectory(), ze.getUnixMode()!= 0 ? ze.getUnixMode() : null, ze.isSymbolicLink(), null );
+ in.close();
+ }
+
+@@ -175,14 +180,14 @@ public abstract class AbstractZipUnArchiver
+
+ private void extractFileIfIncluded( final File sourceFile, final File destDirectory, final InputStream inputStream,
+ final String name, final Date time, final boolean isDirectory,
+- final Integer mode )
++ final Integer mode, boolean isSymlink, String linkName )
+ throws IOException, ArchiverException
+ {
+ try
+ {
+ if ( include( inputStream, name ) )
+ {
+- extractFile( sourceFile, destDirectory, inputStream, name, time, isDirectory, mode );
++ extractFile( sourceFile, destDirectory, inputStream, name, time, isDirectory, mode, isSymlink, linkName );
+ }
+ }
+ catch ( final ArchiveFilterException e )
+@@ -193,7 +198,7 @@ public abstract class AbstractZipUnArchiver
+
+ protected void extractFile( final File srcF, final File dir, final InputStream compressedInputStream,
+ final String entryName, final Date entryDate, final boolean isDirectory,
+- final Integer mode )
++ final Integer mode, boolean isSymlink, String linkName )
+ throws IOException, ArchiverException
+ {
+ final File f = FileUtils.resolveFile( dir, entryName );
+@@ -218,18 +223,36 @@ public abstract class AbstractZipUnArchiver
+ }
+ else
+ {
+- OutputStream out = null;
+- try
+- {
+- out = new FileOutputStream( f );
+-
+- IOUtil.copy( compressedInputStream, out );
+- }
+- finally
+- {
+- IOUtil.close( out );
++ if ( isSymlink ) {
++ BufferedReader buff = null;
++ Path path;
++ if ( linkName != null ) {
++ path = Paths.get( linkName );
++ } else {
++ try {
++ buff = new BufferedReader( new InputStreamReader( compressedInputStream ) );
++ String value = buff.readLine();
++ path = Paths.get( value );
++ }
++ finally
++ {
++ IOUtil.close( buff );
++ }
++ }
++ Files.createSymbolicLink( f.toPath(), path );
++ } else {
++ OutputStream out = null;
++ try {
++ out = new FileOutputStream( f );
++
++ IOUtil.copy( compressedInputStream, out );
++ }
++ finally
++ {
++ IOUtil.close( out );
++ }
+ }
+- }
++ }
+
+ f.setLastModified( entryDate.getTime() );
+
+@@ -269,7 +292,7 @@ public abstract class AbstractZipUnArchiver
+ final InputStream inputStream = zipFile.getInputStream( ze );
+ extractFileIfIncluded( getSourceFile(), outputDirectory, inputStream,
+ ze.getName(), new Date( ze.getTime() ), ze.isDirectory(),
+- ze.getUnixMode() != 0 ? ze.getUnixMode() : null );
++ ze.getUnixMode() != 0 ? ze.getUnixMode() : null, ze.isSymbolicLink(), null );
+ inputStream.close();
+ }
+ }
+diff --git a/src/main/java/org/codehaus/plexus/archiver/zip/ZipEntry.java b/src/main/java/org/codehaus/plexus/archiver/zip/ZipEntry.java
+index 6c00720..9ec7273 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/zip/ZipEntry.java
++++ b/src/main/java/org/codehaus/plexus/archiver/zip/ZipEntry.java
+@@ -416,6 +416,15 @@ public class ZipEntry
+ return getName().endsWith( "/" );
+ }
+
++ /**
++ * @since 2.4.5
++ */
++ public boolean isSymbolicLink()
++ {
++ // From POSIX spec for <sys/stat.h>
++ return (getUnixMode() & 0170000) == 0120000;
++ }
++
+ protected void setName( String name )
+ {
+ this.name = name;
+--
+1.9.3
+
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index befb89e..d4a7269 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,44 +1,17 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
Name: plexus-archiver
Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: ASL 2.0
URL: http://plexus.codehaus.org/plexus-components/plexus-archiver/
+BuildArch: noarch
+
Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
-
-BuildArch: noarch
+# PLXCOMP-64 and PLXCOMP-113: Add support for extracting zip and tar symbolic links
+# Forwarded upstream: https://github.com/sonatype/plexus-archiver/pull/14
+Patch0: 0001-Fix-PLXCOMP-113-and-PLXCOMP-64.patch
BuildRequires: maven-local
BuildRequires: plexus-containers-container-default
@@ -46,7 +19,6 @@ BuildRequires: plexus-io
BuildRequires: plexus-utils
BuildRequires: apache-commons-compress
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -65,6 +37,7 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
%mvn_file :%{name} plexus/archiver
%build
@@ -80,6 +53,9 @@ Javadoc for %{name}.
%doc LICENSE
%changelog
+* Tue Sep 2 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.4.4-4
+- Add patch for extracting symbolic links
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.4.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 8 months
[tycho] fedoraproject-p2: Do not regenerate IU metadata on every query.
by Roland Grunberg
commit 1c662987514143edf27aae9e54d1f53e371e7380
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Sep 3 14:45:01 2014 -0400
fedoraproject-p2: Do not regenerate IU metadata on every query.
sources | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index f7493c0..57762b3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
127267aa75abd86df6815bcbd7f2492d tycho-0.21.0.tar.bz2
8303bf4c107a219ce0c916bb692046f6 eclipse-bootstrap.tar.xz
-b77555821c803592ab4b13b06f38280c fedoraproject-p2-9a9a6e.tar.xz
+104c74837e6296a95989dd8fcbfdf2ee fedoraproject-p2-962aa8.tar.xz
diff --git a/tycho.spec b/tycho.spec
index 9dbfd7e..b5ec51a 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -15,7 +15,7 @@
# %%global snap -SNAPSHOT
%global snap %{nil}
-%global fp_p2_sha 9a9a6e
+%global fp_p2_sha 962aa8
%global fp_p2_version 0.0.1
%global fp_p2_snap -SNAPSHOT
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -368,6 +368,9 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
%{_javadocdir}/%{name}
%changelog
+* Wed Sep 03 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-4
+- fedoraproject-p2: Do not regenerate IU metadata on every query.
+
* Thu Aug 28 2014 Mat Booth <mat.booth(a)redhat.com> - 0.21.0-3
- Perform non-bootstrap build
- Update running-env-only patch
9 years, 8 months