- glibc build fixes
- applied java reorganisations from svn
This commit is contained in:
Tomas Janousek
parent
f4dcdcabee
commit
37c9aa8820
11
brltty-3.9-gnusource.patch
Normal file
11
brltty-3.9-gnusource.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- brltty-3.9/configure.ac.gnusource 2007-10-17 17:19:31.000000000 +0200
|
||||
+++ brltty-3.9/configure.ac 2008-02-28 14:30:57.000000000 +0100
|
||||
@@ -678,7 +678,7 @@
|
||||
case "${host_os}"
|
||||
in
|
||||
linux*|gnu*|kfreebsd*)
|
||||
- brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500"
|
||||
+ brltty_cv_prog_cc_sysflags="-D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_GNU_SOURCE"
|
||||
;;
|
||||
solaris*)
|
||||
brltty_cv_prog_cc_sysflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
|
||||
1300
brltty-3.9-java-svn.patch
Normal file
1300
brltty-3.9-java-svn.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,143 +0,0 @@
|
||||
--- brltty-3.9/Bindings/Java/BrlapiException.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiException.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiException extends Exception {
|
||||
static final long serialVersionUID = 0;
|
||||
--- brltty-3.9/Bindings/Java/Makefile.in.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/Makefile.in 2008-01-07 12:16:14.000000000 +0100
|
||||
@@ -48,17 +48,12 @@
|
||||
JAVA_JAR_FILE = $(API_NAME).jar
|
||||
jar: $(JAVA_JAR_FILE)
|
||||
|
||||
-API_CLASSES = Brlapi.class BrlapiNative.class BrlapiError.class BrlapiException.class BrlapiSettings.class BrlapiWriteArguments.class BrlapiSize.class BrlapiKey.class
|
||||
-ALL_CLASSES = $(API_CLASSES) ApiTest.class
|
||||
+$(JAVA_JAR_FILE): apiclasses.made
|
||||
+ $(JAR) cf $@ -C classes .
|
||||
|
||||
-$(JAVA_JAR_FILE): $(API_CLASSES)
|
||||
- $(JAR) cf $@ Brlapi*.class
|
||||
-
|
||||
-$(ALL_CLASSES): $(SRC_DIR)/*.java BrlapiConstants.class
|
||||
- $(JAVAC) -d . -classpath . $(SRC_DIR)/*.java
|
||||
-
|
||||
-BrlapiConstants.class: BrlapiConstants.java
|
||||
- $(JAVAC) BrlapiConstants.java
|
||||
+apiclasses.made: $(SRC_DIR)/Brlapi*.java BrlapiConstants.java
|
||||
+ $(JAVAC) -d classes -classpath . $(SRC_DIR)/Brlapi*.java
|
||||
+ touch $@
|
||||
|
||||
BrlapiConstants.java: $(CONSTANTS_SCRIPTS) $(CONSTANTS_SOURCES)
|
||||
$(AWK) $(CONSTANTS_OPTIONS) $(CONSTANTS_SOURCES) >$@
|
||||
@@ -66,12 +61,14 @@
|
||||
doc: javadoc.made
|
||||
|
||||
javadoc.made: $(SRC_DIR)/*.java BrlapiConstants.java
|
||||
- $(JAVADOC) -quiet -d . -author -version -use $(SRC_DIR)/*.java BrlapiConstants.java
|
||||
+ $(JAVADOC) -quiet -d doc -author -version -use $(SRC_DIR)/*.java BrlapiConstants.java
|
||||
touch $@
|
||||
|
||||
clean::
|
||||
- -rm -f BrlapiConstants.java *.class $(JAVA_JAR_FILE) $(JAVA_JNI_FILE)
|
||||
- -rm -f javadoc.made package-list *.css *.html
|
||||
+ -rm -f BrlapiConstants.java apiclasses.made $(JAVA_JAR_FILE) $(JAVA_JNI_FILE)
|
||||
+ -rm -f -r classes
|
||||
+ -rm -f javadoc.made
|
||||
+ -rm -f -r doc
|
||||
-rm -f -r resources
|
||||
-rm -f gjdoc.properties JAVADOC.PLACEHOLDER
|
||||
|
||||
--- brltty-3.9/Bindings/Java/ApiTest.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/ApiTest.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class ApiTest {
|
||||
public static void main(String argv[]) {
|
||||
--- brltty-3.9/Bindings/Java/BrlapiWriteArguments.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiWriteArguments.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiWriteArguments {
|
||||
public int displayNumber = Brlapi.DISPLAY_DEFAULT;
|
||||
--- brltty-3.9/Bindings/Java/BrlapiSettings.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiSettings.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiSettings {
|
||||
public String host;
|
||||
--- brltty-3.9/Bindings/Java/BrlapiError.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiError.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiError extends Exception {
|
||||
static final long serialVersionUID = 0;
|
||||
--- brltty-3.9/Bindings/Java/constants.awk.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/constants.awk 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -19,6 +19,7 @@
|
||||
###############################################################################
|
||||
|
||||
BEGIN {
|
||||
+ print "package cc.mielke.brltty;"
|
||||
print "public interface BrlapiConstants {"
|
||||
}
|
||||
|
||||
--- brltty-3.9/Bindings/Java/BrlapiNative.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiNative.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiNative {
|
||||
protected long handle;
|
||||
--- brltty-3.9/Bindings/Java/BrlapiKey.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiKey.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiKey {
|
||||
protected final long code;
|
||||
--- brltty-3.9/Bindings/Java/Brlapi.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/Brlapi.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class Brlapi extends BrlapiNative implements BrlapiConstants {
|
||||
protected final BrlapiSettings settings;
|
||||
--- brltty-3.9/Bindings/Java/BrlapiSize.java.javadoc 2007-10-17 17:19:30.000000000 +0200
|
||||
+++ brltty-3.9/Bindings/Java/BrlapiSize.java 2008-01-07 12:01:06.000000000 +0100
|
||||
@@ -17,6 +17,7 @@
|
||||
*
|
||||
* This software is maintained by Dave Mielke <dave@mielke.cc>.
|
||||
*/
|
||||
+package cc.mielke.brltty;
|
||||
|
||||
public class BrlapiSize {
|
||||
protected final int width;
|
||||
12
brltty.spec
12
brltty.spec
@ -9,13 +9,14 @@
|
||||
|
||||
Name: brltty
|
||||
Version: %{pkg_version}
|
||||
Release: 2.1%{?dist}
|
||||
Release: 2.2%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
URL: http://mielke.cc/brltty/
|
||||
Source: http://mielke.cc/brltty/releases/%{name}-%{version}.tar.gz
|
||||
Patch0: brltty-3.9-tcl85path.patch
|
||||
Patch1: brltty-3.9-javadoc.patch
|
||||
Patch1: brltty-3.9-java-svn.patch
|
||||
Patch2: brltty-3.9-gnusource.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-InstallRoot
|
||||
Summary: Braille display driver for Linux/Unix.
|
||||
Requires(post): coreutils
|
||||
@ -115,7 +116,8 @@ This package provides the Java binding for BrlAPI.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .tcl85path
|
||||
%patch1 -p1 -b .javadoc
|
||||
%patch1 -p1 -b .java-svn
|
||||
%patch2 -p1 -b .gnusource
|
||||
./autogen
|
||||
|
||||
%build
|
||||
@ -215,6 +217,10 @@ exit 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 28 2008 Tomas Janousek <tjanouse@redhat.com> - 3.9-2.2
|
||||
- glibc build fixes
|
||||
- applied java reorganisations from svn
|
||||
|
||||
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.9-2.1
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user