Skip to content

OF-3107 RPM spec cleanup #2949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+2 −19
Open

OF-3107 RPM spec cleanup #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff0202
OF-2199 RPM package: remove support of bundled JRE
stokito Jul 13, 2025
b9f6a7f
OF-3107 RPM package: remove $OPENFIRE_PIDFILE from openfire-sysconfig…
stokito Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions build/rpm/openfire.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ Version: %{OPENFIRE_VERSION}
Release: %{OPENFIRE_RELEASE}
BuildRoot: %{_builddir}/%{name}-root
Source0: %{OPENFIRE_SOURCE}
%ifarch noarch
# Note that epoch is set here to 1, this appears to be consistent with non-Redhat
Copy link
Contributor Author

@stokito stokito Jul 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

epoch is set here to 1

Could you explain what does the comment mean? It looks like very outdated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't recall if we once had to mess with the RPM epoch due to some release issue or not. I also am unsure if it is needed anymore or not, but I thought once you bumped the epoch, you can't go back? shrug

# jres as well due to an ancient problem with java-1.5.0-ibm jpackage RPM
Requires: java >= 1:17.0.0
%endif
Group: Applications/Communications
Vendor: Igniterealtime Community
Packager: Igniterealtime Community
Expand Down Expand Up @@ -45,12 +43,6 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{prefix}
# Copy over the main install tree.
cp -R . $RPM_BUILD_ROOT%{homedir}
%ifnarch noarch
# Set up distributed JRE
pushd $RPM_BUILD_ROOT%{homedir}
gzip -cd %{SOURCE1} | tar xvf -
popd
%endif
# Set up the init script.
mkdir -p $RPM_BUILD_ROOT/etc/init.d
cp $RPM_BUILD_ROOT%{homedir}/bin/extra/redhat/openfire $RPM_BUILD_ROOT/etc/init.d/openfire
Expand Down Expand Up @@ -151,9 +143,6 @@ exit 0
%doc %{homedir}/changelog.html
%{_sysconfdir}/init.d/openfire
%config(noreplace) %{_sysconfdir}/sysconfig/openfire
%ifnarch noarch
%{homedir}/jre
%endif

%changelog
* %{OPENFIRE_BUILDDATE} Igniterealtime Community <[email protected]> %{OPENFIRE_VERSION}-%{OPENFIRE_RELEASE}
Expand Down
3 changes: 1 addition & 2 deletions distribution/src/bin/extra/redhat/openfire
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ fi
# If openfire user is not set in sysconfig, set to daemon.
[ -z "$OPENFIRE_USER" ] && OPENFIRE_USER="daemon"

# If pid file path is not set in sysconfig, set to /var/run/openfire.pid.
[ -z "$OPENFIRE_PIDFILE" ] && OPENFIRE_PIDFILE="/var/run/openfire.pid"
OPENFIRE_PIDFILE="/var/run/openfire.pid"

# -----------------------------------------------------------------

Expand Down
4 changes: 0 additions & 4 deletions distribution/src/bin/extra/redhat/openfire-sysconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# change the following line.
#OPENFIRE_USER="daemon"

# If you wish to change the location of the openfire pid file,
# change the following line.
#OPENFIRE_PIDFILE="/var/run/openfire.pid"

# If you wish to explicitly specific the location of the log directory,
# you can set it here. Note that this applies to the logs generated outside
# openfire itself. If you want to change the location of openfire's own
Expand Down
3 changes: 1 addition & 2 deletions distribution/src/bin/openfirectl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ fi
# If openfire user is not set elsewhere, set to daemon.
[ -z "$OPENFIRE_USER" ] && OPENFIRE_USER="daemon"

# If pid file path is not set elsewhere, set to /var/run/openfire.pid.
[ -z "$OPENFIRE_PIDFILE" ] && OPENFIRE_PIDFILE="/var/run/openfire.pid"
OPENFIRE_PIDFILE="/var/run/openfire.pid"

# -----------------------------------------------------------------

Expand Down
Loading