Compare commits
5 Commits
11_0_0-4_e
...
master
Author | SHA1 | Date | |
---|---|---|---|
1252615c5d | |||
a10a6e6d50 | |||
241e8cf5a5 | |||
24d6bf84e8 | |||
c509d7acac |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.log
|
||||
*spec-20*
|
||||
*.tar.xz
|
||||
*.bak
|
||||
|
@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-LPRng smeserver
|
||||
<br />https://wiki.koozali.org/
|
||||
|
||||
## Bugzilla
|
||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-LPRng&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
|
||||
Show list of outstanding bugs:
|
||||
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-LPRng&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-LPRng&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
And a list of outstanding Legacy bugs: (e-smith-LPRng) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-LPRng&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||
|
||||
## Description
|
||||
|
@@ -69,9 +69,3 @@ safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/lpd"
|
||||
templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
|
||||
event_link("systemd-default", $event, "06");
|
||||
|
||||
#--------------------------------------------------
|
||||
# remove for systemd
|
||||
## Make service statup symlinks
|
||||
#safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/lpd");
|
||||
#safe_symlink("/etc/rc.d/init.d/e-smith-service", "root/etc/rc.d/rc7.d/S60lpd");
|
||||
safe_symlink("/var/service/lpd", "root/service/lpd");
|
||||
|
@@ -1,15 +1,16 @@
|
||||
[Unit]
|
||||
Description=lpd, LPRng print spool
|
||||
After=network.target
|
||||
Requires=runit.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
Type=simple
|
||||
User=root
|
||||
Group=root
|
||||
Restart=always
|
||||
RestartSec=2
|
||||
TimeoutSec=0
|
||||
ExecStartPre=/sbin/e-smith/service-status lpd
|
||||
ExecStart=/usr/bin/sv u /service/lpd
|
||||
ExecStop=/usr/bin/sv stop /service/lpd
|
||||
ExecReload=/usr/bin/sv t /service/lpd
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/sbin/lpd -F
|
||||
|
||||
[Install]
|
||||
WantedBy=sme-server.target
|
||||
|
@@ -1,2 +0,0 @@
|
||||
#! /bin/sh
|
||||
exec /usr/sbin/lpd -F
|
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LPRng module
|
||||
%define name smeserver-LPRng
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 4
|
||||
%define release 5
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -25,6 +25,9 @@ smeserver server and gateway software - LPRng module.
|
||||
Add printing features, using the LPRng package.
|
||||
|
||||
%changelog
|
||||
* Thu Apr 18 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
|
||||
- move service to full systemd unit [SME: 12635]
|
||||
|
||||
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
|
||||
- Update createlinks to create smeserver-package-update event[SME: 12579]
|
||||
|
||||
@@ -598,7 +601,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
|
||||
rm -f %{name}-%{version}-%{release}-filelist
|
||||
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
|
||||
--file /var/service/lpd/run 'attr(0755,root,root)' \
|
||||
> %{name}-%{version}-%{release}-filelist
|
||||
echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
|
||||
|
||||
@@ -608,5 +610,13 @@ rm -f /etc/lpd.perms
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%pre
|
||||
# ease the transition between runit and systemd
|
||||
if [ $1 -gt 1 ] ; then
|
||||
if [ -e /var/service/lpd ] ; then
|
||||
/usr/bin/sv d lpd
|
||||
fi
|
||||
fi
|
||||
|
||||
%files -f %{name}-%{version}-%{release}-filelist
|
||||
%defattr(-,root,root)
|
||||
|
Reference in New Issue
Block a user