Commit 92d00e55 authored by jswaelens's avatar jswaelens

Merge branch '5-update-and-correct-the-changelog' into '1.2.1-fixes'

Resolve "Update and correct the changelog"

See merge request redhat/argonaut!14
parents 60695ce7 3472c475
## %"Argonaut 1.2.2" - 2019-01-08
- New upstream release, no changes
## %"Argonaut 1.2.1" - 2018-12-15 ## %"Argonaut 1.2.1" - 2018-12-15
### Changed ### Changed
......
Name: argonaut Name: argonaut
Version: _VERSION_ Version: _VERSION_
Release: _RELEASE_ Release: _RELEASE_
Summary: Tool to convert schema into ldif format Summary: Tool to convert schema into ldif format
...@@ -12,10 +12,10 @@ Source1: %{name}-client.service ...@@ -12,10 +12,10 @@ Source1: %{name}-client.service
Source2: %{name}-server.service Source2: %{name}-server.service
Source3: %{name}-fai-monitor.service Source3: %{name}-fai-monitor.service
Source4: %{name}-fuse.service Source4: %{name}-fuse.service
Source5: %{name}-fuse.logrotate Source5: %{name}-fuse.logrotate
Source6: %{name}.te Source6: %{name}.te
Patch0: %{name}-fix-ldap-directory.patch Patch0: %{name}-fix-ldap-directory.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch BuildArch: noarch
...@@ -185,7 +185,7 @@ gzip ./%{name}-fusiondirectory/man/%{name}-user-reminder.1 ...@@ -185,7 +185,7 @@ gzip ./%{name}-fusiondirectory/man/%{name}-user-reminder.1
mkdir SELinux mkdir SELinux
cp -p %{SOURCE6} SELinux cp -p %{SOURCE6} SELinux
# Change version of %{name}.te # Change version of %%{name}.te
sed -i 's/_SELINUX-VERSION_/%{version}/g' SELinux/%{name}.te sed -i 's/_SELINUX-VERSION_/%{version}/g' SELinux/%{name}.te
############################ ############################
...@@ -208,12 +208,12 @@ cd - ...@@ -208,12 +208,12 @@ cd -
rm -rf %{buildroot} rm -rf %{buildroot}
# Directories # Directories
mkdir -p %{buildroot}/lib/systemd/system/ mkdir -p %{buildroot}/%{_lib}/systemd/system/
mkdir -p %{buildroot}/%{_sbindir}/ mkdir -p %{buildroot}/%{_sbindir}/
mkdir -p %{buildroot}/%{_datadir}/perl5/ mkdir -p %{buildroot}/%{_datadir}/perl5/
mkdir -p %{buildroot}/%{_datadir}/man1/ mkdir -p %{buildroot}/%{_datadir}/man1/
mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/ mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}/usr/lib/fai/ mkdir -p %{buildroot}/usr/%{_lib}/fai/
mkdir -p %{buildroot}/%{_sysconfdir}/fai/nfsroot-hooks/ mkdir -p %{buildroot}/%{_sysconfdir}/fai/nfsroot-hooks/
mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Fuse/Modules/ mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Fuse/Modules/
mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Server/Modules/ mkdir -p %{buildroot}/%{_datadir}/perl5/Argonaut/Server/Modules/
...@@ -323,10 +323,10 @@ cp -a ./Argonaut/ %{buildroot}/%{_datadir}/perl5/ ...@@ -323,10 +323,10 @@ cp -a ./Argonaut/ %{buildroot}/%{_datadir}/perl5/
cd .. cd ..
# Copy service file # Copy service file
cp %{S:1} %{buildroot}/lib/systemd/system/ cp %{S:1} %{buildroot}/%{_lib}/systemd/system/
cp %{S:2} %{buildroot}/lib/systemd/system/ cp %{S:2} %{buildroot}/%{_lib}/systemd/system/
cp %{S:3} %{buildroot}/lib/systemd/system/ cp %{S:3} %{buildroot}/%{_lib}/systemd/system/
cp %{S:4} %{buildroot}/lib/systemd/system/ cp %{S:4} %{buildroot}/%{_lib}/systemd/system/
# Set the good rights # Set the good rights
chmod +x %{buildroot}/%{_sbindir}/* chmod +x %{buildroot}/%{_sbindir}/*
...@@ -376,7 +376,7 @@ rm -rf %{buildroot} ...@@ -376,7 +376,7 @@ rm -rf %{buildroot}
%{_datadir}/perl5/Argonaut/ClientDaemon/Modules/Service.pm %{_datadir}/perl5/Argonaut/ClientDaemon/Modules/Service.pm
%{_datadir}/perl5/Argonaut/ClientDaemon/Modules/System.pm %{_datadir}/perl5/Argonaut/ClientDaemon/Modules/System.pm
%{_datadir}/man1/%{name}-client.1.gz %{_datadir}/man1/%{name}-client.1.gz
/lib/systemd/system/%{name}-client.service /%{_lib}/systemd/system/%{name}-client.service
%files common %files common
%defattr(-,root,root,-) %defattr(-,root,root,-)
...@@ -409,7 +409,7 @@ rm -rf %{buildroot} ...@@ -409,7 +409,7 @@ rm -rf %{buildroot}
%{_datadir}/perl5/Argonaut/Server/ModulesPool.pm %{_datadir}/perl5/Argonaut/Server/ModulesPool.pm
%{_datadir}/perl5/Argonaut/Server/Modules/Argonaut.pm %{_datadir}/perl5/Argonaut/Server/Modules/Argonaut.pm
%{_datadir}/man1/%{name}-server.1.gz %{_datadir}/man1/%{name}-server.1.gz
/lib/systemd/system/%{name}-server.service /%{_lib}/systemd/system/%{name}-server.service
%files fuse-module-fai %files fuse-module-fai
%defattr(-,root,root,-) %defattr(-,root,root,-)
...@@ -429,14 +429,14 @@ rm -rf %{buildroot} ...@@ -429,14 +429,14 @@ rm -rf %{buildroot}
%{_sysconfdir}/logrotate.d/%{name}-fuse %{_sysconfdir}/logrotate.d/%{name}-fuse
%{_sbindir}/%{name}-fuse %{_sbindir}/%{name}-fuse
%{_datadir}/man1/argonaut-fuse.1.gz %{_datadir}/man1/argonaut-fuse.1.gz
/lib/systemd/system/%{name}-fuse.service /%{_lib}/systemd/system/%{name}-fuse.service
%files fai-monitor %files fai-monitor
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc Authors.md Changelog %doc Authors.md Changelog
/usr/sbin/%{name}-fai-monitor /usr/sbin/%{name}-fai-monitor
%{_datadir}/man1/%{name}-fai-monitor.1.gz %{_datadir}/man1/%{name}-fai-monitor.1.gz
/lib/systemd/system/%{name}-fai-monitor.service /%{_lib}/systemd/system/%{name}-fai-monitor.service
%files yumgroup2yumi %files yumgroup2yumi
%defattr(-,root,root,-) %defattr(-,root,root,-)
...@@ -500,6 +500,9 @@ rm -rf %{buildroot} ...@@ -500,6 +500,9 @@ rm -rf %{buildroot}
#date + "%a %b %d %Y" #date + "%a %b %d %Y"
%changelog %changelog
* Tue Jan 08 2019 SWAELENS Jonathan <jonathan@opensides.be> - 1.2.2-1
- New upstream release
* Sat Dec 15 2018 SWAELENS Jonathan <jonathan@opensides.be> - 1.2.1-1 * Sat Dec 15 2018 SWAELENS Jonathan <jonathan@opensides.be> - 1.2.1-1
- [Changed] argonaut#2 Update AUTHORS.md file - [Changed] argonaut#2 Update AUTHORS.md file
...@@ -519,7 +522,7 @@ rm -rf %{buildroot} ...@@ -519,7 +522,7 @@ rm -rf %{buildroot}
* Sun Mar 20 2016 SWAELENS Jonathan <jonathan@opensides.be> - 0.9.6-1 * Sun Mar 20 2016 SWAELENS Jonathan <jonathan@opensides.be> - 0.9.6-1
- New upstream release - New upstream release
* Tue Jan 07 2016 SWAELENS Jonathan <jonthan@opensides.be> - 0.9.5-1 * Thu Jan 07 2016 SWAELENS Jonathan <jonthan@opensides.be> - 0.9.5-1
- Fixes #4435 Use Service.systemd.pm and System.systemd.pm - Fixes #4435 Use Service.systemd.pm and System.systemd.pm
- Fixes #4435 Correct directory of systemd libs - Fixes #4435 Correct directory of systemd libs
...@@ -545,7 +548,7 @@ rm -rf %{buildroot} ...@@ -545,7 +548,7 @@ rm -rf %{buildroot}
- Fixes #4357 Add fuse in argonaut-fuse dependences - Fixes #4357 Add fuse in argonaut-fuse dependences
- Fixes #4375 Add perl-App-Daemon dependence for argonaut-fuse and argonaut-fai-monitor - Fixes #4375 Add perl-App-Daemon dependence for argonaut-fuse and argonaut-fai-monitor
* Fri Apr 26 2015 SWAELENS Jonathan <jonathan@opensides.be> - 0.9.2-1 * Sun Apr 26 2015 SWAELENS Jonathan <jonathan@opensides.be> - 0.9.2-1
- Add argonaut-fai-monitor package - Add argonaut-fai-monitor package
- Add yumgroup2yumi package - Add yumgroup2yumi package
- Remove argonaut-fai-mirror because it is only for Debian repository - Remove argonaut-fai-mirror because it is only for Debian repository
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment