mirror of
https://abf.rosa.ru/djam/webmin.git
synced 2025-02-23 16:02:47 +00:00
Automatic import for version 1.580
This commit is contained in:
Rosa
parent
e790a580cc
commit
ec556ca420
5 changed files with 61 additions and 37 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,7 +1,7 @@
|
|||
sources:
|
||||
"openvpn-2.0.wbm.gz": 4039007c5f921fd4f32b1952f9cddf0dc98bef58
|
||||
"other.modules.tar.bz2": 96c8a928edf7f2ab40a6ad4c5c87f85654edfb5e
|
||||
"webmin-1.560.tar.gz": 02ae664b0f01a8214aac018c74fd34447336ed5d
|
||||
"webmin-1.580.tar.gz": 1f300796b9b6a62665dd03cb98b5ed7ce6666615
|
||||
"webmin-i18n-20080131.tar.bz2": 7c8ba368a7543df997ca1351a8411c2003fc9ccd
|
||||
"webmin-mandriva-theme.tar.bz2": 74b1b6d054ad136c22f84dc9bb24ed013bb1f7fc
|
||||
"webmin-scripts-i18n.tar.bz2": 2f1a23774d5d563be934616d1c820e3bfbe48275
|
||||
|
|
|
|||
BIN
awstats-1.9.wbm
Normal file
BIN
awstats-1.9.wbm
Normal file
Binary file not shown.
BIN
dgwebmin-0.7.1.wbm
Normal file
BIN
dgwebmin-0.7.1.wbm
Normal file
Binary file not shown.
0
webmin-postinstallscript.sh
Executable file → Normal file
0
webmin-postinstallscript.sh
Executable file → Normal file
96
webmin.spec
96
webmin.spec
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
%if %mandriva_branch == Cooker
|
||||
# Cooker
|
||||
%define release %mkrel 2
|
||||
%define release %mkrel 1
|
||||
%else
|
||||
# Old distros
|
||||
%define subrel 1
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
Summary: An SSL web-based administration interface for Unix systems
|
||||
Name: webmin
|
||||
Version: 1.560
|
||||
Version: 1.580
|
||||
Release: %{release}
|
||||
License: BSD
|
||||
Group: System/Configuration/Other
|
||||
|
|
@ -59,6 +59,8 @@ Source56: http://www.bvan.f2s.com/ldap_browser_LDAPapi.wbm
|
|||
Source57: http://prdownloads.sourceforge.net/netatalk/netatalk.wbm
|
||||
Source99: webmin-scripts-i18n.tar.bz2
|
||||
Source100: webmin-i18n-%{i18n_date}.tar.bz2
|
||||
Source101: awstats-1.9.wbm
|
||||
Source102: dgwebmin-0.7.1.wbm
|
||||
Patch0: webmin-fix-configs.diff
|
||||
Patch1: webmin-1.100-remove-atboot-problem
|
||||
Patch5: webmin-fix-newmods.patch
|
||||
|
|
@ -114,6 +116,8 @@ LOGIN TO "https://localhost:10000/" AND NOT "http://localhost:10000/".
|
|||
tar xf %{SOURCE54}
|
||||
tar xf %{SOURCE541}
|
||||
tar xf %{SOURCE57}
|
||||
tar xf %{SOURCE101}
|
||||
tar xf %{SOURCE102}
|
||||
|
||||
install -m 0644 %{SOURCE33} mandriva/webmin/images
|
||||
install -m 0644 %{SOURCE34} mandriva/webmin/images
|
||||
|
|
@ -121,33 +125,33 @@ rm -fr %{name}-%{version}/dhcpd
|
|||
rm -fr %{name}-%{version}/useradmin
|
||||
|
||||
%setup -q -D -T -c -a 9 -n %{name}-%{version}
|
||||
%if %{mdkversion} < 20101
|
||||
%patch0 -p0
|
||||
%endif
|
||||
%patch1 -p0
|
||||
%patch5 -p0
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p0
|
||||
%patch10 -p1
|
||||
#%if %{mdkversion} < 20101
|
||||
#%patch0 -p0
|
||||
#%endif
|
||||
#%patch1 -p0
|
||||
#%patch5 -p0
|
||||
#%patch7 -p1
|
||||
#%patch8 -p1
|
||||
#%patch9 -p0
|
||||
#%patch10 -p1
|
||||
|
||||
%patch13 -p0
|
||||
%patch15 -p0
|
||||
#%patch13 -p0
|
||||
#%patch15 -p0
|
||||
#%patch17 -p1
|
||||
%patch19 -p0
|
||||
%patch21 -p0
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch26 -p1
|
||||
%patch29 -p1
|
||||
%patch32 -p0
|
||||
%patch33 -p1
|
||||
%patch35 -p1
|
||||
%patch36 -p0
|
||||
%patch37 -p1
|
||||
%patch38 -p1
|
||||
%patch39 -p1
|
||||
%patch40 -p1
|
||||
#%patch19 -p0
|
||||
#%patch21 -p0
|
||||
#%patch23 -p1
|
||||
#%patch24 -p1
|
||||
#%patch26 -p1
|
||||
#%patch29 -p1
|
||||
#%patch32 -p0
|
||||
#%patch33 -p1
|
||||
#%patch35 -p1
|
||||
#%patch36 -p0
|
||||
#%patch37 -p1
|
||||
#%patch38 -p1
|
||||
#%patch39 -p1
|
||||
#%patch40 -p1
|
||||
# use MD5 by default
|
||||
|
||||
for i in */config-mandrake-linux-8.2; do n=`echo $i | perl -pe 's/...$/9.0/'`; [ -e $n ] || cp $i $n; done
|
||||
|
|
@ -178,10 +182,10 @@ rm -f mount/openbsd-mounts-*
|
|||
find -name ".xvpics" -o -name ".*.swp" | xargs rm -rf
|
||||
|
||||
# i18n
|
||||
%if %{with_i18n_tarball}
|
||||
#%if %{with_i18n_tarball}
|
||||
#tar -jxf %{_sourcedir}/webmin-i18n-%{i18n_date}.tar.bz2
|
||||
tar -jxf %{SOURCE100}
|
||||
%endif
|
||||
#tar -jxf %{SOURCE100}
|
||||
#%endif
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -270,9 +274,9 @@ install -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/logrotate.d/webmin
|
|||
%_create_ssl_certificate -b miniserv
|
||||
%else
|
||||
# fix SSL cert location
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ssl/webmin
|
||||
mv -f $RPM_BUILD_ROOT%{_datadir}/webmin/miniserv.pem \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/webmin
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/ssl/webmin
|
||||
mv -f %{buildroot}%{_datadir}/webmin/miniserv.pem \
|
||||
%{buildroot}%{_sysconfdir}/ssl/webmin
|
||||
%endif
|
||||
if [ "$1" != 0 ]; then
|
||||
service webmin status >/dev/null 2>/dev/null && need_restart=1
|
||||
|
|
@ -318,9 +322,29 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 18 2011 Lonyai Gergely <aleph@mandriva.org> 1.560-1.1mdv2011.0
|
||||
+ Revision: 695143
|
||||
- 1.560
|
||||
* Thu Jan 26 2012 Lonyai Gergely <aleph@mandriva.org> 1.580-1mdv2012.0
|
||||
+ Revision: 769019
|
||||
- 1.580
|
||||
|
||||
* Sat Dec 24 2011 Lonyai Gergely <aleph@mandriva.org> 1.570-3
|
||||
+ Revision: 745006
|
||||
+ rebuild (emptylog)
|
||||
|
||||
* Fri Oct 07 2011 Sergey Zhemoitel <serg@mandriva.org> 1.570-2.1
|
||||
+ Revision: 703393
|
||||
- add new plugins awstats dansguardian
|
||||
|
||||
* Thu Oct 06 2011 Sergey Zhemoitel <serg@mandriva.org> 1.570-2
|
||||
+ Revision: 703231
|
||||
- imported package webmin
|
||||
|
||||
* Thu Aug 18 2011 Lonyai Gergely <aleph@mandriva.org> 1.560-2
|
||||
+ Revision: 695142
|
||||
- release; rediff: atboot.patch; recreate: init-status-fix.patch to new init module
|
||||
|
||||
+ Sergey Zhemoitel <serg@mandriva.org>
|
||||
- new release 1.560
|
||||
- new release
|
||||
|
||||
* Mon Jun 13 2011 Oden Eriksson <oeriksson@mandriva.com> 1.550-2
|
||||
+ Revision: 684493
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue