rpm/proftpd
SHA256
1
0
Fork 0
forked from pool/proftpd
Code Pull Requests Activity

Accepting request 394497 from home:jengelh:branches:network

Browse Source 
- Remove redundant spec sections
- Ensure systemd-tmpfiles is called for the provied config file

OBS-URL: https://build.opensuse.org/request/show/394497
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=38
This commit is contained in:
Marcus Meissner 2016-05-13 08:10:05 +00:00 committed by Git OBS Bridge
parent af0f5be0b0
commit b4c3f7e42b
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proftpd.changes
View File

@ -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 Sun May 8 19:25:45 UTC 2016 - chris@computersalat.de

26
proftpd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package proftpd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -220,8 +220,7 @@ export CXXFLAGS="$CFLAGS"
# on `rpm -Uvh` PARAM is 2 # on `rpm -Uvh` PARAM is 2
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_post %{name}.service %service_add_post %{name}.service
/usr/bin/systemd-tmpfiles --create %{name}.conf || :
%{__install} -d /run/%{name}
%else %else
%{fillup_and_insserv -f proftpd} %{fillup_and_insserv -f proftpd}
%{__install} -d %{_localstatedir}/run/%{name} %{__install} -d %{_localstatedir}/run/%{name}
@ -238,13 +237,10 @@ fi
%service_del_postun %{name}.service %service_del_postun %{name}.service
%endif %endif
%clean
%{__rm} -rf %{buildroot}
%if 0%{?lang_package:1} > 0 %if 0%{?lang_package:1} > 0
%files lang -f %{name}.lang %files lang -f %{name}.lang
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
%defattr(-,root,root,-) %defattr(-,root,root)
%dir %{_datadir}/locale/bg_BG %dir %{_datadir}/locale/bg_BG
%dir %{_datadir}/locale/bg_BG/LC_MESSAGES %dir %{_datadir}/locale/bg_BG/LC_MESSAGES
%dir %{_datadir}/locale/ja_JP %dir %{_datadir}/locale/ja_JP
@ -257,7 +253,7 @@ fi
%else %else
%files -f %{name}.lang %files -f %{name}.lang
%endif %endif
%defattr(-,root,root,-) %defattr(-,root,root)
%doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES %doc COPYING CREDITS ChangeLog NEWS README* RELEASE_NOTES
%doc contrib/README.* %doc contrib/README.*
#%doc contrib/xferstats.holger-preiss* #%doc contrib/xferstats.holger-preiss*
@ -292,32 +288,32 @@ fi
%endif %endif
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root)
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%files ldap %files ldap
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/%{name}/mod_ldap.so %{_libdir}/%{name}/mod_ldap.so
%files mysql %files mysql
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/%{name}/mod_sql_mysql.so %{_libdir}/%{name}/mod_sql_mysql.so
%files pgsql %files pgsql
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/%{name}/mod_sql_postgres.so %{_libdir}/%{name}/mod_sql_postgres.so
%files radius %files radius
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/%{name}/mod_radius.so %{_libdir}/%{name}/mod_radius.so
%files sqlite %files sqlite
%defattr(-,root,root,-) %defattr(-,root,root)
%{_libdir}/%{name}/mod_sql_sqlite.so %{_libdir}/%{name}/mod_sql_sqlite.so
%files doc %files doc
%defattr(-,root,root,-) %defattr(-,root,root)
%doc doc/*.html doc/contrib doc/howto doc/modules %doc doc/*.html doc/contrib doc/howto doc/modules
%changelog %changelog