[jetty] Comment on removing jetty user during upgrade
by Mikolaj Izdebski
commit d4692bd6c5c70feb184ab73aa779d1f7b10cf46f
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 23 15:07:39 2012 +0200
Comment on removing jetty user during upgrade
jetty.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 6dbca89..3895db2 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -366,6 +366,8 @@ if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
fi
+# Remove the user even during upgrade, it will be added later in %post.
+# This is required to force incorrect UID to be replaced with the new one.
%__fe_userdel %username &>/dev/null || :
%__fe_groupdel %username &>/dev/null || :
12 years, 1 month
[jetty] Drop init script, resolves #814788
by Mikolaj Izdebski
commit c0d6d44e654349fddc936437e39d8113bdd757f7
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 23 14:53:49 2012 +0200
Drop init script, resolves #814788
- Remove jetty.script from SCM
- Reload systemd on package install/upgrade/remove
jetty.init | 153 ----------------------------------------------------------
jetty.script | 49 -------------------
jetty.spec | 39 +++++++++------
3 files changed, 23 insertions(+), 218 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 215a03c..6dbca89 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -52,7 +52,6 @@ License: ASL 2.0
URL: http://jetty.mortbay.org/jetty/
Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jet...
Source1: djetty.script
-Source2: jetty.init
Source3: jetty.logrotate
Source4: %{name}-depmap.xml
Source5: %{name}.service
@@ -117,7 +116,9 @@ Requires: xerces-j2 >= 0:2.7
Requires: xml-commons-apis
%{?FE_USERADD_REQ}
-Requires(post): systemd-sysv
+Requires(post): systemd-units, systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
Provides: group(%username) = %jtuid
Provides: user(%username) = %jtuid
@@ -182,7 +183,6 @@ mvn-rpmbuild -X \
%install
# dirs
install -dm 755 %{buildroot}%{_bindir}
-install -dm 755 %{buildroot}%{_initrddir}
install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d
install -dm 755 %{buildroot}%{_javadir}/%{name}
@@ -208,7 +208,6 @@ chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
chmod +x djetty
mv djetty %{buildroot}%{_bindir}/djetty
ln -s %{homedir}/bin/jetty.sh %{buildroot}%{_bindir}/%{name}
-install -pm 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
echo '# Placeholder configuration file. No default is provided.' > \
%{buildroot}%{confdir}/jetty.conf
@@ -345,14 +344,28 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%pre
# Add the "jetty" user and group
%__fe_groupadd %jtuid -r %username &>/dev/null || :
-# Use /bin/sh so init script will start properly.
-%__fe_useradd %jtuid -r -s /bin/sh -d %homedir -M \
+%__fe_useradd %jtuid -r -s /sbin/nologin -d %homedir -M \
-g %username %username &>/dev/null || :
%post
-[ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name}
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || :
+ /bin/systemctl stop %{name}.service >/dev/null 2>&1 || :
+fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
+fi
%__fe_userdel %username &>/dev/null || :
%__fe_groupdel %username &>/dev/null || :
@@ -370,13 +383,6 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
/sbin/chkconfig --del jetty >/dev/null 2>&1 || :
/bin/systemctl try-restart jetty.service >/dev/null 2>&1 || :
-%preun
-if [ $1 = 0 ]; then
- [ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop
- [ -f %{_initrddir}/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name}
-
- %{_sbindir}/fedora-userdel %{name} >> /dev/null 2>&1 || :
-fi
%files
%doc NOTICE.txt README.txt VERSION.txt LICENSE*
@@ -404,8 +410,9 @@ fi
%changelog
* Mon Apr 23 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.0-6
-- Fix incorrect init script return value
-- Resolves #814788
+- Drop init script, resolves #814788
+- Remove jetty.script from SCM
+- Reload systemd on package install/upgrade/remove
* Wed Apr 18 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.0-5
- Replace eclipse-rcp BR with felix-framework
12 years, 1 month
[apache-commons-daemon] add s390x as known arch
by Dan Horák
commit 38c161e22493d47ef1314f63fdd08e230a473869
Author: Dan Horák <dan(a)danny.cz>
Date: Mon Apr 23 12:41:15 2012 +0200
add s390x as known arch
apache-commons-daemon-s390x.patch | 28 ++++++++++++++++++++++++++++
apache-commons-daemon.spec | 7 ++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/apache-commons-daemon-s390x.patch b/apache-commons-daemon-s390x.patch
new file mode 100644
index 0000000..c54c245
--- /dev/null
+++ b/apache-commons-daemon-s390x.patch
@@ -0,0 +1,28 @@
+diff -up commons-daemon-1.0.10-src/src/native/unix/configure.s390x commons-daemon-1.0.10-src/src/native/unix/configure
+--- commons-daemon-1.0.10-src/src/native/unix/configure.s390x 2012-04-23 11:55:56.000000000 +0200
++++ commons-daemon-1.0.10-src/src/native/unix/configure 2012-04-23 11:57:18.000000000 +0200
+@@ -2671,6 +2671,10 @@ echo "$as_me: error: Unsupported operati
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ s390x)
++ CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
++ supported_os="s390x"
++ HOST_CPU=s390x;;
+ arm*)
+ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+ supported_os="arm"
+diff -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
+--- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x 2012-04-23 11:56:04.000000000 +0200
++++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4 2012-04-23 11:56:41.000000000 +0200
+@@ -140,6 +140,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+ CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+ supported_os="s390"
+ HOST_CPU=s390;;
++ s390x)
++ CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
++ supported_os="s390x"
++ HOST_CPU=s390x;;
+ arm*)
+ CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+ supported_os="arm"
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 54272f3..65ef8ee 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.0.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -12,6 +12,7 @@ URL: http://commons.apache.org/%{base_name}
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
Patch0: 0001-execve-path-warning.patch
Patch1: apache-commons-daemon-JAVA_OS.patch
+Patch2: apache-commons-daemon-s390x.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: maven
@@ -63,6 +64,7 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 1:1.0.1
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1 -b .execve
%patch1 -p1 -b .java_os
+%patch2 -p1 -b .s390x
# remove java binaries from sources
rm -rf src/samples/build/
@@ -134,6 +136,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 1.0.10-3
+- add s390x as known arch
+
* Thu Mar 29 2012 Dennis Gilmore <dennis(a)ausil.us> - 1.0.10-2
- $supported_os and $JAVA_OS in configure do not always match
- on arches that override supported_os to be the arch we can not find headers
12 years, 1 month
[jetty/f17] Fix incorrect init script return value
by Mikolaj Izdebski
commit ffadfe76cca42a0ab023fcf97418d4d8c9e0e490
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Apr 23 08:30:54 2012 +0200
Fix incorrect init script return value
- Resolves #814788
jetty.init | 9 ++++-----
jetty.spec | 6 +++++-
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/jetty.init b/jetty.init
index 58e5664..e96c8ce 100644
--- a/jetty.init
+++ b/jetty.init
@@ -137,17 +137,16 @@ case "$1" in
start
;;
condrestart)
- if [ -f $JETTY_PID ] ; then
- stop
- start
- fi
+ [ -f $JETTY_PID ] || exit 0
+ stop
+ start
;;
*)
echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 1
esac
-exit $RETVAL
+exit $?
#
#
diff --git a/jetty.spec b/jetty.spec
index 41071b0..215a03c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -403,6 +403,10 @@ fi
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Apr 23 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.0-6
+- Fix incorrect init script return value
+- Resolves #814788
+
* Wed Apr 18 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.0-5
- Replace eclipse-rcp BR with felix-framework
- Add missing R: felix-framework
12 years, 1 month
rpmguard: INFO; 1 warnings for maven-scm-1.6-3.fc18
by autoqa@fedoraproject.org
========================================================================
AutoQA Rpmguard Test Results
------------------------------------------------------------------------
ID maven-scm-1.6-3.fc18
Result INFO
Summary 1 warnings
Architecture all
Test ended 2012-04-23 06:41:53 UTC
This is just an overview extract of the test results, please see the log for more details:
http://autoqa.fedoraproject.org/report/7obm
12 years, 1 month
[Bug 813707] New: maven-scm: Bundled libraries
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: maven-scm: Bundled libraries
https://bugzilla.redhat.com/show_bug.cgi?id=813707
Summary: maven-scm: Bundled libraries
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: maven-scm
AssignedTo: guido.grazioli(a)gmail.com
ReportedBy: mizdebsk(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, guido.grazioli(a)gmail.com,
sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com
Classification: Fedora
Story Points: ---
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
maven-scm is bundling several libraries, including:
apache-commons-lang
junit
classworlds
plexus
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
12 years, 1 month
[maven-scm] Fix typo
by Guido Grazioli
commit 3b6d6b8ce1c59fb682a21d67c8d96a1773e7afcf
Author: Guido Grazioli <guido.grazioli(a)gmail.com>
Date: Mon Apr 23 16:24:04 2012 +1000
Fix typo
maven-scm.spec | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/maven-scm.spec b/maven-scm.spec
index ccae8f9..4c0c778 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
Name: maven-scm
Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Common API for doing SCM operations
License: ASL 2.0
Group: Development/Libraries
@@ -159,8 +159,6 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# we dont want this distributed
-rm $RPM_BUILD_ROOT%{_javadocdir}/%{name}/javadoc.sh
%files
%dir %{_javadir}/%{name}
@@ -181,6 +179,9 @@ rm $RPM_BUILD_ROOT%{_javadocdir}/%{name}/javadoc.sh
%{_javadocdir}/*
%changelog
+* Mon Apr 23 2012 Guido Grazioli <guido.grazioli(a)gmail.com> - 1.6-3
+- Fix typo
+
* Mon Apr 23 2012 Guido Grazioli <guido.grazioli(a)gmail.com> - 1.6-2
- Remove -client-with-dependencies jar to get rid of duplicate libraries
- Switch off maven execution debug output
12 years, 1 month