Changes to 'refs/tags/tanukiwrapper-3.2.3-6'
by Michael Mraka
Tag 'tanukiwrapper-3.2.3-6' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-01-18 10:15 +0000
Tagging package [tanukiwrapper] version [3.2.3-6] in directory [spec-tree/tanukiwrapper/].
Changes since oracle-selinux-0.1.23.34-1:
Michael Mraka (3):
rebuild package via standard process from git
increase release not version when building thirdparty package
Automatic commit of package [tanukiwrapper] minor release [3.2.3-6].
---
rel-eng/packages/tanukiwrapper | 1
spec-tree/tanukiwrapper/build.py.props | 4
spec-tree/tanukiwrapper/tanukiwrapper-Makefile-s390-s390x-ppc.patch | 128 ++++++++++
spec-tree/tanukiwrapper/tanukiwrapper-Makefile-sparc-sparc64.patch | 86 ++++++
spec-tree/tanukiwrapper/tanukiwrapper-build.patch | 10
spec-tree/tanukiwrapper/tanukiwrapper-compilewithfpic.patch | 36 ++
spec-tree/tanukiwrapper/tanukiwrapper-crosslink.patch | 12
spec-tree/tanukiwrapper/tanukiwrapper-makefile-linux-x86-32.patch | 11
spec-tree/tanukiwrapper/tanukiwrapper-nosun-jvm-64.patch | 26 ++
spec-tree/tanukiwrapper/tanukiwrapper.spec | 10
10 files changed, 323 insertions(+), 1 deletion(-)
---
11 years, 4 months
3 commits - rel-eng/packages spec-tree/tanukiwrapper
by Michael Mraka
rel-eng/packages/tanukiwrapper | 1
spec-tree/tanukiwrapper/build.py.props | 4
spec-tree/tanukiwrapper/tanukiwrapper-Makefile-s390-s390x-ppc.patch | 128 ++++++++++
spec-tree/tanukiwrapper/tanukiwrapper-Makefile-sparc-sparc64.patch | 86 ++++++
spec-tree/tanukiwrapper/tanukiwrapper-build.patch | 10
spec-tree/tanukiwrapper/tanukiwrapper-compilewithfpic.patch | 36 ++
spec-tree/tanukiwrapper/tanukiwrapper-crosslink.patch | 12
spec-tree/tanukiwrapper/tanukiwrapper-makefile-linux-x86-32.patch | 11
spec-tree/tanukiwrapper/tanukiwrapper-nosun-jvm-64.patch | 26 ++
spec-tree/tanukiwrapper/tanukiwrapper.spec | 10
10 files changed, 323 insertions(+), 1 deletion(-)
New commits:
commit 36cd614300d8d331cd656398e992eb99ebf2ed31
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 18 11:15:22 2013 +0100
Automatic commit of package [tanukiwrapper] minor release [3.2.3-6].
diff --git a/rel-eng/packages/tanukiwrapper b/rel-eng/packages/tanukiwrapper
new file mode 100644
index 0000000..b1be010
--- /dev/null
+++ b/rel-eng/packages/tanukiwrapper
@@ -0,0 +1 @@
+3.2.3-6 spec-tree/tanukiwrapper/
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper.spec b/spec-tree/tanukiwrapper/tanukiwrapper.spec
index 5a4dd29..daff784 100644
--- a/spec-tree/tanukiwrapper/tanukiwrapper.spec
+++ b/spec-tree/tanukiwrapper/tanukiwrapper.spec
@@ -34,7 +34,7 @@
Name: tanukiwrapper
Version: 3.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Service Wrapper
Epoch: 0
License: BSD
@@ -206,6 +206,9 @@ fi
%doc doc/*
%changelog
+* Fri Jan 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 3.2.3-6
+- rebuild package via standard process from git
+
* Sun Oct 25 2009 Dennis Gilmore <dennis(a)ausil.us> - 0:3.2.3-5
- add patch with sparc support
commit e1fd7c57f68493f7432e9784b8d0f0c0f7c1ad4c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 18 11:12:53 2013 +0100
increase release not version when building thirdparty package
diff --git a/spec-tree/tanukiwrapper/build.py.props b/spec-tree/tanukiwrapper/build.py.props
new file mode 100644
index 0000000..20c6311
--- /dev/null
+++ b/spec-tree/tanukiwrapper/build.py.props
@@ -0,0 +1,4 @@
+[buildconfig]
+tagger = spacewalk.releng.tagger.ReleaseTagger
+builder = spacewalkx.builderx.NoTgzBuilder
+
commit 96b97ae240175ca7d652715642efb74193b11878
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 18 11:05:54 2013 +0100
rebuild package via standard process from git
imported tanukiwrapper patches and spec changes from el6
to be properly rebuild from git via lookaside cache feature
(older version were somehow imported / built manually)
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-s390-s390x-ppc.patch b/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-s390-s390x-ppc.patch
new file mode 100644
index 0000000..53ee60a
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-s390-s390x-ppc.patch
@@ -0,0 +1,128 @@
+--- src/c/Makefile-linux-s390-32.old 1969-12-31 19:00:00.000000000 -0500
++++ src/c/Makefile-linux-s390-32 2006-08-04 16:39:15.000000000 -0400
+@@ -0,0 +1,39 @@
++COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++ rm -f *.o
++
++cleanall: clean
++ rm -rf *~ .deps
++ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++ if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++ $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++ ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++ @echo '$(COMPILE) -c $<'; \
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
++ @-cp .deps/$(*F).pp .deps/$(*F).P; \
++ tr ' ' '\012' < .deps/$(*F).pp \
++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++ >> .deps/$(*F).P; \
++ rm .deps/$(*F).pp
+--- src/c/Makefile-linux-s390x-64.old 1969-12-31 19:00:00.000000000 -0500
++++ src/c/Makefile-linux-s390x-64 2006-08-04 16:38:53.000000000 -0400
+@@ -0,0 +1,39 @@
++COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++ rm -f *.o
++
++cleanall: clean
++ rm -rf *~ .deps
++ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++ if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++ $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++ ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++ @echo '$(COMPILE) -c $<'; \
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
++ @-cp .deps/$(*F).pp .deps/$(*F).P; \
++ tr ' ' '\012' < .deps/$(*F).pp \
++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++ >> .deps/$(*F).P; \
++ rm .deps/$(*F).pp
+--- src/c/Makefile-linux-ppc-32.old 1969-12-31 19:00:00.000000000 -0500
++++ src/c/Makefile-linux-ppc-32 2006-08-04 17:43:10.000000000 -0400
+@@ -0,0 +1,41 @@
++# This makefile is inprogess. It builds, but the resulting libwrapper.so does not yet work.
++# If you know how to fix it then please help out.
++COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -fasynchronous-unwind-tables -fPIC --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++ rm -f *.o
++
++cleanall: clean
++ rm -rf *~ .deps
++ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++ if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++ $(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++ @echo '$(COMPILE) -c $<'; \
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
++ @-cp .deps/$(*F).pp .deps/$(*F).P; \
++ tr ' ' '\012' < .deps/$(*F).pp \
++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++ >> .deps/$(*F).P; \
++ rm .deps/$(*F).pp
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-sparc-sparc64.patch b/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-sparc-sparc64.patch
new file mode 100644
index 0000000..d2837b4
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-Makefile-sparc-sparc64.patch
@@ -0,0 +1,86 @@
+--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32 2009-10-15 19:40:08.633904530 +0000
++++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc-32 2009-10-26 00:29:29.000000000 +0000
+@@ -0,0 +1,39 @@
++COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -mcpu=ultrasparc -Wall --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++ rm -f *.o
++
++cleanall: clean
++ rm -rf *~ .deps
++ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++ if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++ $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++ ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++ @echo '$(COMPILE) -c $<'; \
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
++ @-cp .deps/$(*F).pp .deps/$(*F).P; \
++ tr ' ' '\012' < .deps/$(*F).pp \
++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++ >> .deps/$(*F).P; \
++ rm .deps/$(*F).pp
+--- wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64 2009-10-15 19:40:08.633904530 +0000
++++ wrapper_3.2.3_src/src/c/Makefile-linux-sparc64-64 2009-10-26 00:28:26.000000000 +0000
+@@ -0,0 +1,41 @@
++# This makefile is inprogess. It builds, but the resulting libwrapper.so does not yet work.
++# If you know how to fix it then please help out.
++COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mcpu=ultrasparc -fPIC -Wall --pedantic
++
++INCLUDE=$(JAVA_HOME)/include
++
++DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
++
++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
++
++libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
++
++BIN = ../../bin
++LIB = ../../lib
++
++all: init wrapper libwrapper.so
++
++clean:
++ rm -f *.o
++
++cleanall: clean
++ rm -rf *~ .deps
++ rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
++
++init:
++ if test ! -d .deps; then mkdir .deps; fi
++
++wrapper: $(wrapper_SOURCE)
++ $(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
++
++libwrapper.so: $(libwrapper_so_OBJECTS)
++ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
++
++%.o: %.c
++ @echo '$(COMPILE) -c $<'; \
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
++ @-cp .deps/$(*F).pp .deps/$(*F).P; \
++ tr ' ' '\012' < .deps/$(*F).pp \
++ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++ >> .deps/$(*F).P; \
++ rm .deps/$(*F).pp
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-build.patch b/spec-tree/tanukiwrapper/tanukiwrapper-build.patch
new file mode 100644
index 0000000..24ce52a
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-build.patch
@@ -0,0 +1,10 @@
+--- build.xml~ 2006-03-01 05:34:34.000000000 +0200
++++ build.xml 2006-05-09 11:15:33.000000000 +0300
+@@ -294,2 +294,3 @@
+ <target name="convert" depends="init:msg, init:java-missing">
++ <!-- No-op, but prevents build using ant-nodeps built with non-Sun JDK :(
+ <native2ascii src="${src.dir}/java"
+@@ -299,2 +300,3 @@
+ includes="**/*.native" />
++ -->
+ </target>
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-compilewithfpic.patch b/spec-tree/tanukiwrapper/tanukiwrapper-compilewithfpic.patch
new file mode 100644
index 0000000..64bd623
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-compilewithfpic.patch
@@ -0,0 +1,36 @@
+diff -up ./src/c/Makefile-linux-ppc-64.sav ./src/c/Makefile-linux-ppc-64
+--- ./src/c/Makefile-linux-ppc-64.sav 2009-07-31 12:18:21.000000000 -0400
++++ ./src/c/Makefile-linux-ppc-64 2009-07-31 12:18:31.000000000 -0400
+@@ -33,7 +33,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
+
+ %.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+diff -up ./src/c/Makefile-linux-x86-32.sav ./src/c/Makefile-linux-x86-32
+--- ./src/c/Makefile-linux-x86-32.sav 2009-07-31 12:17:28.000000000 -0400
++++ ./src/c/Makefile-linux-x86-32 2009-07-31 12:19:11.000000000 -0400
+@@ -31,7 +31,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
+
+ %.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+diff -up ./src/c/Makefile-linux-x86-64.sav ./src/c/Makefile-linux-x86-64
+--- ./src/c/Makefile-linux-x86-64.sav 2009-07-31 12:17:40.000000000 -0400
++++ ./src/c/Makefile-linux-x86-64 2009-07-31 12:19:41.000000000 -0400
+@@ -33,7 +33,7 @@ libwrapper.so: $(libwrapper_so_OBJECTS)
+
+ %.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+- $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
++ $(COMPILE) $(DEFS) -fPIC -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-crosslink.patch b/spec-tree/tanukiwrapper/tanukiwrapper-crosslink.patch
new file mode 100644
index 0000000..aedc09e
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-crosslink.patch
@@ -0,0 +1,12 @@
+--- build.xml~ 2006-05-09 11:15:33.000000000 +0300
++++ build.xml 2006-05-09 11:18:34.000000000 +0300
+@@ -15,3 +15,4 @@
+ <!-- property name="classpath" value=""/ -->
+-
++ <property name="jdk.api" value="http://java.sun.com/j2se/1.5/docs/api/" />
++
+ <property name="ant.dist.version" value="1.6.2"/>
+@@ -577,2 +578,3 @@
+ destdir="${jdoc.dir}"
++ link="${jdk.api}"
+ author="true"
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-makefile-linux-x86-32.patch b/spec-tree/tanukiwrapper/tanukiwrapper-makefile-linux-x86-32.patch
new file mode 100644
index 0000000..1e9afa8
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-makefile-linux-x86-32.patch
@@ -0,0 +1,11 @@
+--- ./src/c/Makefile-linux-x86-32.orig 2006-08-04 01:07:48.000000000 -0400
++++ ./src/c/Makefile-linux-x86-32 2006-08-04 01:09:35.000000000 -0400
+@@ -24,7 +24,7 @@
+ if test ! -d .deps; then mkdir .deps; fi
+
+ wrapper: $(wrapper_SOURCE)
+- $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper
++ $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+ libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper-nosun-jvm-64.patch b/spec-tree/tanukiwrapper/tanukiwrapper-nosun-jvm-64.patch
new file mode 100644
index 0000000..52352be
--- /dev/null
+++ b/spec-tree/tanukiwrapper/tanukiwrapper-nosun-jvm-64.patch
@@ -0,0 +1,26 @@
+diff -up ./build.xml.sav ./build.xml
+--- ./build.xml.sav 2006-10-17 10:21:20.000000000 -0400
++++ ./build.xml 2008-09-24 10:57:02.000000000 -0400
+@@ -65,6 +65,7 @@
+ <equals arg1="${os.arch}" arg2="ia64"/>
+ <equals arg1="${os.arch}" arg2="x86_64"/>
+ <equals arg1="${os.arch}" arg2="x86"/>
++ <equals arg1="${os.arch}" arg2="x86_64"/>
+ <equals arg1="${os.arch}" arg2="i686"/>
+ <equals arg1="${os.arch}" arg2="i586"/>
+ <equals arg1="${os.arch}" arg2="i486"/>
+@@ -168,12 +169,14 @@
+ </condition>
+
+ <!-- Not all JVMs support the sun.arch.data.model property. Default to 32-bit. -->
++ <!--
+ <property name="sun.arch.data.model" value="32"/>
+ <condition property="bits-mismatch" value="true">
+ <not>
+ <equals arg1="${sun.arch.data.model}" arg2="${bits}"/>
+ </not>
+ </condition>
++ -->
+
+ <condition property="pre-release.disable" value="true">
+ <not>
diff --git a/spec-tree/tanukiwrapper/tanukiwrapper.spec b/spec-tree/tanukiwrapper/tanukiwrapper.spec
index 22bdcb5..5a4dd29 100644
--- a/spec-tree/tanukiwrapper/tanukiwrapper.spec
+++ b/spec-tree/tanukiwrapper/tanukiwrapper.spec
@@ -63,9 +63,11 @@ Requires: jpackage-utils >= 0:1.6
Obsoletes: %{name}-demo < 0:3.1.2-2jpp
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat
+%endif
%description
The Java Service Wrapper is an application which has
@@ -184,6 +186,7 @@ fi
%endif
%files
+%defattr(-,root,root,-)
%doc doc/license.txt *.sample
%{_sbindir}/%{name}
%{_libdir}/libwrapper.so
@@ -194,10 +197,12 @@ fi
%endif
%files javadoc
+%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}
%files manual
+%defattr(0644,root,root,0755)
%doc doc/*
%changelog
11 years, 4 months
Changes to 'refs/tags/oracle-selinux-0.1.23.34-1'
by Jan Pazdziora
Tag 'oracle-selinux-0.1.23.34-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 17:57 +0000
Tagging package [oracle-selinux] version [0.1.23.34-1] in directory [selinux/oracle-selinux/].
Changes since spacewalk-java-1.9.44-1:
Jan Pazdziora (2):
The rx_file_perms seems no longer available.
Automatic commit of package [oracle-selinux] release [0.1.23.34-1].
---
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
selinux/oracle-selinux/oracle.te | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 4 months
2 commits - rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
rel-eng/packages/oracle-selinux | 2 +-
selinux/oracle-selinux/oracle-selinux.spec | 5 ++++-
selinux/oracle-selinux/oracle.te | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d2d2c4acfd33ae0d4ca38783811b7fedfe18140b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 18:57:24 2013 +0100
Automatic commit of package [oracle-selinux] release [0.1.23.34-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index 96d5e47..30ded31 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.33-1 selinux/oracle-selinux/
+0.1.23.34-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 7ee899f..20d20e4 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -19,7 +19,7 @@
%endif
Name: oracle-selinux
-Version: 0.1.23.33
+Version: 0.1.23.34
Release: 1%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -209,6 +209,9 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 0.1.23.34-1
+- The rx_file_perms seems no longer available.
+
* Mon Jul 16 2012 Jan Pazdziora 0.1.23.33-1
- Start using the .tar.gz in the .src.rpm for oracle-selinux.
- %%defattr is not needed since rpm 4.4
commit db3ff20589158d1abb9107aa704a4137e1b114ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 18:46:59 2013 +0100
The rx_file_perms seems no longer available.
Addressing
oracle.te":166:ERROR 'permission rx_file_perms is not defined for class file' at token ';' on line 12865:
on Fedora 18.
diff --git a/selinux/oracle-selinux/oracle.te b/selinux/oracle-selinux/oracle.te
index 51ac7a5..bcd72b4 100644
--- a/selinux/oracle-selinux/oracle.te
+++ b/selinux/oracle-selinux/oracle.te
@@ -163,7 +163,7 @@ allow oracle_lsnrctl_t oracle_tnslsnr_t:unix_stream_socket connectto;
# Allow listener to execute oracle binary
allow oracle_tnslsnr_t bin_t:dir search;
-allow oracle_tnslsnr_t oracle_db_exec_t:file { rx_file_perms };
+can_exec(oracle_tnslsnr_t, oracle_db_exec_t)
allow oracle_tnslsnr_t oracle_db_t:fd use;
# Allow listener to communicate with database via shared memory
11 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.9.44-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.44-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 13:05 +0000
Tagging package [spacewalk-java] version [1.9.44-1] in directory [java/].
Changes since spacewalk-java-1.9.43-1:
Jan Pazdziora (2):
Checkstyle fix.
Automatic commit of package [spacewalk-java] release [1.9.44-1].
---
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 4 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 2 +-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ac644498753212f8de3d9579771af3f0b858d6c1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 14:05:27 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index eed920f..ebae4cc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.43
+Version: 1.9.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.44-1
+- Checkstyle fix.
+
* Thu Jan 17 2013 Jan Pazdziora 1.9.43-1
- Checkstyle fixes.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d922939..0c7571a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.43-1 java/
+1.9.44-1 java/
commit bc4a8c7ec78ca6dad319768f3936b2056d0def6b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 14:04:04 2013 +0100
Checkstyle fix.
Addressing
/builddir/build/BUILD/spacewalk-java-1.9.43/./code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java:149:1: File contains tab characters (this is the first instance).
diff --git a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
index 51f9cd9..2b4f27c 100644
--- a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
@@ -146,7 +146,7 @@ public class CreateOrgCommand {
// Lookup the SSL crypto key for the default org and copy it to the new:
Org defaultOrg = OrgFactory.getSatelliteOrg();
CryptoKey ssl = KickstartFactory.lookupCryptoKey("RHN-ORG-TRUSTED-SSL-CERT",
- defaultOrg);
+ defaultOrg);
if (ssl != null && ssl.isSSL()) {
// TODO
log.debug("Found a SSL key for the default org to copy: " +
11 years, 4 months
Changes to 'refs/tags/spacewalk-java-1.9.43-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.43-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-01-17 12:28 +0000
Tagging package [spacewalk-java] version [1.9.43-1] in directory [java/].
Changes since spacewalk-reports-1.9.1-1:
Jan Pazdziora (2):
Checkstyle fixes.
Automatic commit of package [spacewalk-java] release [1.9.43-1].
---
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 5 ++---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
---
11 years, 4 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 5 ++---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit fedb228dc56057ddbc14ff58fa6fd96322288db5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 13:28:21 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.43-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 80a7fb4..eed920f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.42
+Version: 1.9.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -659,6 +659,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jan 17 2013 Jan Pazdziora 1.9.43-1
+- Checkstyle fixes.
+
* Thu Jan 17 2013 Jan Pazdziora 1.9.42-1
- For RHN-ORG-TRUSTED-SSL-CERT, inform that it will be copied over to new orgs.
- Copy RHN-ORG-TRUSTED-SSL-CERT if it exists, not a random SSL key.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 793ffcc..d922939 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.42-1 java/
+1.9.43-1 java/
commit b753b9eeb59959e21ac18482e1446b4bfe8623ec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jan 17 13:27:40 2013 +0100
Checkstyle fixes.
Addressing
/builddir/build/BUILD/spacewalk-java-1.9.42/./code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java:30:8: Unused import - java.util.List.
/builddir/build/BUILD/spacewalk-java-1.9.42/./code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java:150: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
index 0b8b7b3..51f9cd9 100644
--- a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
@@ -27,8 +27,6 @@ import com.redhat.rhn.manager.user.CreateUserCommand;
import org.apache.log4j.Logger;
-import java.util.List;
-
/**
* CreateOrgCommand - Command to create an org and the first admin in the Org.
* @version $Rev: 119601 $
@@ -147,7 +145,8 @@ public class CreateOrgCommand {
// Lookup the SSL crypto key for the default org and copy it to the new:
Org defaultOrg = OrgFactory.getSatelliteOrg();
- CryptoKey ssl = KickstartFactory.lookupCryptoKey("RHN-ORG-TRUSTED-SSL-CERT", defaultOrg);
+ CryptoKey ssl = KickstartFactory.lookupCryptoKey("RHN-ORG-TRUSTED-SSL-CERT",
+ defaultOrg);
if (ssl != null && ssl.isSSL()) {
// TODO
log.debug("Found a SSL key for the default org to copy: " +
11 years, 4 months
Changes to 'refs/tags/spacewalk-reports-1.9.1-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.9.1-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-01-17 09:47 +0000
Tagging package [spacewalk-reports] version [1.9.1-1] in directory [reporting/].
Changes since spacewalk-abrt-1.9.1-1:
Tomas Kasparek (2):
parametrization of spacewalk-report with spacewalk config
Automatic commit of package [spacewalk-reports] release [1.9.1-1].
---
rel-eng/packages/spacewalk-reports | 2 +-
reporting/reports.py | 11 +++++++++++
reporting/reports/data/inactive-systems | 7 +++++--
reporting/spacewalk-report | 7 +------
reporting/spacewalk-reports.spec | 12 +++++++++++-
5 files changed, 29 insertions(+), 10 deletions(-)
---
11 years, 4 months
rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit bf3bb2b426a8fcb1830b48f121c0f019895156af
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jan 17 10:47:52 2013 +0100
Automatic commit of package [spacewalk-reports] release [1.9.1-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 980da56..39b96bc 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.8.4-1 reporting/
+1.9.1-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 3eea959..9d0bfa9 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,16 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Thu Jan 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.9.1-1
+- parametrization of spacewalk-report with spacewalk config
+- security fix + fixing typo
+- 703629 - spacewalk-report inactive-systems RFE
+- 662773 - spacewalk-report system-packages-installed
+- 745342 - additional column in spacewalk-report inventory
+- removing unnecesarry whitespaces
+- 477631 - spacewalk-report RFE
+- Bumping package versions for 1.9.
+
* Sat Jun 16 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.4-1
- 827022 - add COPYING file
11 years, 4 months