[jabref] Update to 2.9.2

mef mef at fedoraproject.org
Fri Jan 25 12:29:41 UTC 2013


commit 3ba3516d3e4018ebc21aff5f6db4d21ab84e4ca7
Author: mef3 <mefoster at gmail.com>
Date:   Fri Jan 25 12:29:12 2013 +0000

    Update to 2.9.2

 .gitignore                   |    1 +
 jabref-2.9.2-build_xml.patch |   58 ++++++++++++++++++++++++++++++++++++++++++
 jabref.spec                  |    9 +++---
 sources                      |    2 +-
 4 files changed, 64 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9a6150..e8711cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /JabRef-2.8-src.tar.bz2
 /JabRef-2.9-src.tar.bz2
+/JabRef-2.9.2-src.tar.bz2
diff --git a/jabref-2.9.2-build_xml.patch b/jabref-2.9.2-build_xml.patch
new file mode 100644
index 0000000..9491333
--- /dev/null
+++ b/jabref-2.9.2-build_xml.patch
@@ -0,0 +1,58 @@
+--- jabref-2.9.2/build.xml.orig	2013-01-25 11:03:07.095730699 +0000
++++ jabref-2.9.2/build.xml	2013-01-25 11:03:21.857678549 +0000
+@@ -155,10 +155,13 @@
+ 
+ 	<!-- Classpath for running the code generator -->
+ 	<path id="codegenerator">
+-		<pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
+-		<pathelement location="${lib.dir}/plugin/jpf.jar" />
+-		<pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
+-		<pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
++            <pathelement location="/usr/share/java/jpfcodegen.jar" />
++            <pathelement location="/usr/share/java/jpf.jar" />
++            <pathelement location="/usr/share/java/jpf-boot.jar" />
++            <pathelement location="/usr/share/java/velocity.jar" />
++            <pathelement location="/usr/share/java/apache-commons-logging.jar" />
++            <pathelement location="/usr/share/java/apache-commons-collections.jar" />
++            <pathelement location="/usr/share/java/apache-commons-lang.jar" />
+ 	</path>
+ 
+ 	<!-- Classpath for tests -->
+@@ -239,7 +242,7 @@
+ 	</target>
+ 
+ 	<!-- Jars up project -->
+-	<target name="jars" depends="build, unjarlib">
++	<target name="jars" depends="build">
+ 		<mkdir dir="${build.lib}" />
+         
+ 		<mkdir dir="${build.tmp}" />
+@@ -275,10 +278,6 @@
+ 				<include name="jgoodies.txt" />
+ 				<include name="README" />
+ 			</fileset>
+-			<manifest>
+-				<attribute name="Main-Class" value="net.sf.jabref.JabRefMain" />
+-                <attribute name="Class-Path" value="." />
+-			</manifest>
+ 		</jar>
+ 
+ 	</target>
+@@ -384,7 +383,7 @@
+ 	<!-- Creates javadocs -->
+ 	<target name="javadocs" depends="compile" description="Generates the javadocs">
+ 		<mkdir dir="${build.javadocs}" />
+-		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://docs.oracle.com/javase/6/docs/api/">
++		<javadoc sourcepath="${java.dir}" destdir="${build.javadocs}" author="true" version="true" windowtitle="JabRef API" link="http://docs.oracle.com/javase/6/docs/api/" encoding="ISO-8859-1" docencoding="UTF-8" excludepackagenames="tests.*">
+ 
+ 			<fileset dir="${java.dir}" defaultexcludes="yes">
+ 				<include name="**/*.java" />
+@@ -645,8 +644,6 @@
+ 		</jalopy>
+ 	</target>
+ 
+-	<taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
+ 	<target name="compresssrc">
+ 		<!-- clone current repo into tmp dir. Reason: we want to have a clean src.zip, but do not want to execute "git clean -xdf" to allow developers having some temporary files (and user.properties) -->
+ 		<mkdir dir="${temp.dir}"/>
diff --git a/jabref.spec b/jabref.spec
index 82aeff9..05596c4 100644
--- a/jabref.spec
+++ b/jabref.spec
@@ -3,7 +3,7 @@
 %global libreoffice_dir $(ls -d /usr/lib*/libreoffice)
 
 Name:           jabref
-Version:        2.9
+Version:        2.9.2
 Release:        1%{?dist}
 Summary:        Graphical frontend to manage BibTeX bibliographical databases
 License:        GPLv2+ and BSD
@@ -17,9 +17,8 @@ Source1:        jabref.desktop
 # Adapted from the man page included in the Debian jabref package
 Source2:        jabref.1
 
-# Don't package other classes into the jar; don't use manifest;
 # point to system jars; use correct encoding for javadocs
-Patch0:  %{name}-2.9-build_xml.patch
+Patch0:  %{name}-%{version}-build_xml.patch
 # Remove all uses of "SPL"
 Patch1:  %{name}-2.8b-remove-spl.patch
 # Don't try to integrate into Ubuntu menus
@@ -157,8 +156,8 @@ install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
 %{_javadocdir}/%{name}
 
 %changelog
-* Mon Dec 17 2012 Mary Ellen Foster <mefoster at gmail.com> - 2.9-1
-- Update to 2.9
+* Mon Dec 17 2012 Mary Ellen Foster <mefoster at gmail.com> - 2.9.2-1
+- Update to 2.9.2
 
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 78e3ba4..c80fd94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e20bb7bba885f0764a3a9a27c817796  JabRef-2.9-src.tar.bz2
+7664c578e3a04bb2a3252ba7ca7356c5  JabRef-2.9.2-src.tar.bz2


More information about the scm-commits mailing list