Skip to content
This repository has been archived by the owner on Aug 23, 2019. It is now read-only.

bugfixes, cleanups and improvements #10

Closed
wants to merge 24 commits into from
Closed

bugfixes, cleanups and improvements #10

Changes from 8 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f844164
sympa 6.2.19 beta 2
xavierba Sep 11, 2017
696fd25
Add changelog entry
xavierba Sep 14, 2017
9abd932
Ignore test suite results on F25 and F26, earlier and later releases …
xavierba Sep 14, 2017
fffa167
Use %make_build and %make_install
xavierba Sep 13, 2017
28644ae
Don't override PATH
xavierba Sep 13, 2017
c370756
Move rsyslog conf installation next to logrotate conf installation
xavierba Sep 13, 2017
158c012
Remove useless ca-bundle.crt
xavierba Sep 13, 2017
b29bd76
Move README to doc dir
xavierba Sep 13, 2017
353d936
Add note to unbundle fonts
xavierba Sep 13, 2017
878a7be
Don't ship bogus smtpc.1.md
xavierba Sep 13, 2017
497f4ea
Fix create_cookie to only replace the cookie config and not random co…
xavierba Sep 11, 2017
45958f3
Use mktemp to create temporary cookie file in %post
xavierba Sep 14, 2017
69491c4
Remove function to migrate legacy /etc/sysconfig/sympa
xavierba Sep 13, 2017
ecaa5cf
Remove un-necessary owner/group fixup of main and robot confs
xavierba Sep 13, 2017
392f866
Don't hide intranet choices
xavierba Sep 13, 2017
8992f82
Re-order %files
xavierba Sep 13, 2017
5221a70
Fix creation of directory structure for overiding default configs
xavierba Sep 13, 2017
447299a
data_structure.current_version needs to be owned by user and group sympa
xavierba Sep 27, 2017
af4808c
Replace deprecated fcgid directives with their new names
xavierba Sep 18, 2017
f3b6ba3
FcgidMaxProcesses should be set in /etc/httpd/conf.d/fcgid.conf if ne…
xavierba Sep 19, 2017
139c03c
Rename httpd conf according to httpd version
xavierba Sep 27, 2017
8a89be9
Rename README.RPM.md
xavierba Sep 13, 2017
001e622
Fix typos in README.RPM.md
xavierba Sep 14, 2017
d65ddc7
doc: Setup MTA before DB to receive mail sent by 'sympa.pl --health_c…
xavierba Sep 27, 2017
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
32 changes: 19 additions & 13 deletions SPECS/sympa-6.2.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
%global use_systemd 0
%endif

%global pre_rel b.1
%global pre_rel b.2

Name: sympa
Version: @VERSION@
Release: %{?pre_rel:0.}1%{?pre_rel:.%pre_rel}@REV@%{?dist}
Release: %{?pre_rel:0.}2%{?pre_rel:.%pre_rel}@REV@%{?dist}
Summary: Powerful multilingual List Manager
Summary(fr): Gestionnaire de listes électroniques
Summary(ja): 高機能で多言語対応のメーリングリスト管理ソフトウェア
Expand Down Expand Up @@ -247,8 +247,6 @@ Sympa の nginx 対応。
autoreconf --install
%endif

PATH=/bin:/usr/bin
export PATH
# Give install "-p" preserving mtime to prevent unexpected update of CSS.
%configure \
--enable-fhs \
Expand All @@ -275,7 +273,7 @@ export PATH
--with-aliases_file=%{_localstatedir}/lib/sympa/sympa_aliases \
--with-perl=%{_bindir}/perl \
INSTALL_DATA='install -c -p -m 644'
make %{?_smp_mflags}
%make_build

# cancel workaround in Makefile getting previous version.
rm -f previous_sympa_version
Expand All @@ -285,14 +283,17 @@ pushd po/web_help; rm -f stamp-po; make; popd


%install
make install DESTDIR=%{buildroot}
%make_install

%find_lang %{name}
%find_lang web_help

# Fix perm to prevent warning by rpmlint.
chmod a-x %{buildroot}%{_datadir}/%{name}/bin/create_db.Sybase

# Remove useless ca-bundle.crt
Copy link
Owner

Choose a reason for hiding this comment

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

This file is referred by the code (see Conf.pm). It would be better to propose upstream removal.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, I noticed the issue and worked around it by adding a symlink.
I've filled an issue about this upstream, as you suggested.
sympa-community/sympa#116

rm %{buildroot}%{_datadir}/%{name}/default/ca-bundle.crt

# Save version info.
mv %{buildroot}%{_sysconfdir}/sympa/data_structure.version \
%{buildroot}%{_sysconfdir}/sympa/data_structure.current_version
Expand Down Expand Up @@ -326,10 +327,6 @@ install -m 0755 %{SOURCE104} %{buildroot}%{_initrddir}/wwsympa
install -m 0755 %{SOURCE105} %{buildroot}%{_initrddir}/sympasoap
%endif

# Copy rsyslog config
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d
install -m 0644 %{SOURCE106} %{buildroot}%{_sysconfdir}/rsyslog.d/sympa.conf

# Copy docs.
mv %{buildroot}%{_docdir}/%{name} __doc
cp -p AUTHORS.md CONTRIBUTING.md NEWS.md OChangeLog ONEWS README.md __doc/
Expand All @@ -338,19 +335,24 @@ cp -p %{SOURCE113} __doc/README.RPM.md
%else
cp -p %{SOURCE112} __doc/README.RPM.md
%endif
mv %{buildroot}%{_sysconfdir}/sympa/README __doc/
Copy link
Owner

Choose a reason for hiding this comment

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

CONFDIR/README (etc_README in source) describes usage of CONFDIR and DEFAULTDIR. So it would be on either of these directories.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I understand the rationale for putting this in either (or both) of configdir and defaultdir, but documentation definitely belongs to docdir. Maybe I could move the file to docdir, but also symlink it from both configdir and defaultdir ?


# Copy robot aliases.
cp -p %{SOURCE114} %{SOURCE115} %{buildroot}%{_sysconfdir}/sympa/
chmod 644 %{buildroot}%{_sysconfdir}/sympa/aliases.sympa.*

# Copy rsyslog config
mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d
install -m 0644 %{SOURCE106} %{buildroot}%{_sysconfdir}/rsyslog.d/sympa.conf

# Create logrotate item
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
install -m 0644 %{SOURCE107} %{buildroot}%{_sysconfdir}/logrotate.d/sympa


%check
%if ! 0%{?fedora}
#### Temporarily disabling tests, failing on F25/F26
%if 0%{?fc25}%{?fc26}
#### Temporarily ignoring tests results, failing on F25 and F26
## Failed test 'file, nothing else: ok'
## at t/tools_file.t line 23.
#
Expand All @@ -360,6 +362,8 @@ install -m 0644 %{SOURCE107} %{buildroot}%{_sysconfdir}/logrotate.d/sympa
#t/tools_file.t ...........
#Dubious, test returned 2 (wstat 512, 0x200)
#Failed 2/23 subtests
make check || true
%else
make check
%endif
%if 0%{?do_authorcheck}
Expand Down Expand Up @@ -622,7 +626,6 @@ fi
%{_sysconfdir}/smrsh/*
%config(noreplace) %{_sysconfdir}/rsyslog.d/*
%dir %attr(-,sympa,sympa) %{_sysconfdir}/sympa/
%config(noreplace,missingok) %attr(444,root,root) %{_sysconfdir}/sympa/README
%config(noreplace) %attr(0640,sympa,sympa) %{_sysconfdir}/sympa/sympa.conf
%config(noreplace) %{_sysconfdir}/sympa/aliases.sympa.sendmail
%config(noreplace) %{_sysconfdir}/sympa/aliases.sympa.postfix
Expand Down Expand Up @@ -684,6 +687,9 @@ fi


%changelog
* Thu Sep 14 2017 Xavier Bachelot <xavier@bachelot.org> 6.2.19-0.2.b.2
- Rework spec to better comply with Fedora packaging guidelines.

* Sat Aug 19 2017 IKEDA Soji <ikeda@conversion.co.jp> 6.2.19b.1-1
- Added --bindir to install sympa_smtpc under libexecdir.

Expand Down