diff --git a/proftpd.changes b/proftpd.changes index 6fe133a..867716a 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 8 22:05:07 UTC 2016 - jengelh@inai.de + +- Remove redundant spec sections +- Ensure systemd-tmpfiles is called for the provied config file + ------------------------------------------------------------------- Sun May 8 19:25:45 UTC 2016 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 7188255..0cb4a29 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -220,8 +220,7 @@ export CXXFLAGS="$CFLAGS" # on `rpm -Uvh` PARAM is 2 %if 0%{?has_systemd} %service_add_post %{name}.service - -%{__install} -d /run/%{name} +/usr/bin/systemd-tmpfiles --create %{name}.conf || : %else %{fillup_and_insserv -f proftpd} %{__install} -d %{_localstatedir}/run/%{name} @@ -238,13 +237,10 @@ fi %service_del_postun %{name}.service %endif -%clean -%{__rm} -rf %{buildroot} - %if 0%{?lang_package:1} > 0 %files lang -f %{name}.lang %if 0%{?sles_version} == 11 -%defattr(-,root,root,-) +%defattr(-,root,root) %dir %{_datadir}/locale/bg_BG %dir %{_datadir}/locale/bg_BG/LC_MESSAGES %dir %{_datadir}/locale/ja_JP @@ -257,7 +253,7 @@ fi %else %files -f %{name}.lang %endif -%defattr(-,root,root,-) +%defattr(-,root,root) %doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES %doc contrib/README.* #%doc contrib/xferstats.holger-preiss* @@ -292,32 +288,32 @@ fi %endif %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %files ldap -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/%{name}/mod_ldap.so %files mysql -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/%{name}/mod_sql_mysql.so %files pgsql -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/%{name}/mod_sql_postgres.so %files radius -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/%{name}/mod_radius.so %files sqlite -%defattr(-,root,root,-) +%defattr(-,root,root) %{_libdir}/%{name}/mod_sql_sqlite.so %files doc -%defattr(-,root,root,-) +%defattr(-,root,root) %doc doc/*.html doc/contrib doc/howto doc/modules %changelog