Hello community, here is the log from the commit of package synergy for openSUSE:Factory checked in at 2013-10-31 16:01:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/synergy (Old) and /work/SRC/openSUSE:Factory/.synergy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "synergy" Changes: -------- --- /work/SRC/openSUSE:Factory/synergy/synergy.changes 2013-10-29 09:35:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.synergy.new/synergy.changes 2013-10-31 16:01:18.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Oct 31 10:34:35 UTC 2013 - [email protected] + +- Systemd should be dep only on 12.2+ + +------------------------------------------------------------------- +Thu Oct 31 10:06:59 UTC 2013 - [email protected] + +- Add unitfiles so we can have service for server. +- Adds synergys.service and synergys.socket copied from archlinux. + +------------------------------------------------------------------- New: ---- synergys.service synergys.socket ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ synergy.spec ++++++ --- /var/tmp/diff_new_pack.TdSgT7/_old 2013-10-31 16:01:19.000000000 +0100 +++ /var/tmp/diff_new_pack.TdSgT7/_new 2013-10-31 16:01:19.000000000 +0100 @@ -27,6 +27,8 @@ Source1: synergy-firewall-services Source2: qsynergy.desktop Source3: qsynergy.png +Source4: synergys.socket +Source5: synergys.service Patch0: synergy-1.4.12-cryptopp.patch Patch1: synergy-pthread.patch BuildRequires: cmake @@ -35,14 +37,16 @@ BuildRequires: libqt4-devel BuildRequires: update-desktop-files %if 0%{?suse_version} >= 1220 +BuildRequires: systemd BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xtst) +%{?systemd_requires} %else BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-libX11-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq +Requires(pre): %fillup_prereq Provides: synergy-plus = %{version} Obsoletes: synergy-plus < %{version} @@ -96,23 +100,46 @@ install -D bin/synergys "%{buildroot}%{_bindir}/synergys" install -D -m0644 doc/synergy.conf.example "%{buildroot}%{_sysconfdir}/synergy.conf" install -D -m0644 "%{SOURCE1}" "%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy" -install -D -m0644 doc/synergys.man %{buildroot}/%{_mandir}/man1/synergys.1 -install -D -m0644 doc/synergyc.man %{buildroot}/%{_mandir}/man1/synergyc.1 +install -D -m0644 doc/synergys.man %{buildroot}%{_mandir}/man1/synergys.1 +install -D -m0644 doc/synergyc.man %{buildroot}%{_mandir}/man1/synergyc.1 gzip -9 %{buildroot}/%{_mandir}/man1/synergys.1 +# Unit file +%if 0%{?suse_version} >= 1220 +mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_sbindir} +install -p -m 644 "%{SOURCE4}" %{buildroot}%{_unitdir} +install -p -m 644 "%{SOURCE5}" %{buildroot}%{_unitdir} +%if 0%{?suse_version} > 1220 +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcsynergys +%else +ln -s /sbin/service %{buildroot}%{_sbindir}/rcsynergys +%endif +%endif + # GUI package install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/q%{name} %suse_update_desktop_file -i q%{name} %post %{fillup_only} -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1220 %desktop_database_post +%service_add_post synergys.service synergys.socket %endif -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1220 + %postun %desktop_database_postun +%service_del_postun synergys.service synergys.socket + +%pre +%service_add_pre synergys.service synergys.socket + +%preun +%service_del_preun synergys.service synergys.socket + %endif %files @@ -124,6 +151,11 @@ %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/synergy %doc %{_mandir}/man1/synergys.1%{?ext_man} %doc %{_mandir}/man1/synergyc.1%{?ext_man} +%if 0%{?suse_version} >= 1220 +%{_unitdir}/synergys.service +%{_unitdir}/synergys.socket +%{_sbindir}/rcsynergys +%endif %files -n qsynergy %defattr(-,root,root) ++++++ synergys.service ++++++ [Unit] Description=Synergy Server Daemon After=network.target [Service] Type=forking ExecStart=/usr/bin/synergys --config /etc/synergy.conf [Install] WantedBy=multi-user.target ++++++ synergys.socket ++++++ [Unit] Conflicts=synergys.service [Socket] ListenStream=24800 Accept=false [Install] WantedBy=sockets.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
