This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goplasmabindings. from c4406c2 The plasmoid ends up in %{_libexecdir} (not %{_libdir}). new 4e6a2e5 Rename plasma-widget-x2go to plasma-addons-x2go. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2goplasmabindings.spec | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 4e6a2e58bc32b010233b04ec0b36fd0439a86337 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 15 14:31:19 2014 +0200 Rename plasma-widget-x2go to plasma-addons-x2go. --- debian/changelog | 1 + x2goplasmabindings.spec | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd26b91..938561e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ x2goplasmabindings (3.0.2.1-0x2go1) UNRELEASED; urgency=low + Find a common cmake approach for all RPM distros. + Drop ctest call. No tests present. + The plasmoid ends up in %{_libexecdir} (not %{_libdir}). + + Rename plasma-widget-x2go to plasma-addons-x2go. [ Martti Pitkänen ] * New upstream version (3.0.2.1): diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec index 0a537ab..c88153c 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -19,7 +19,7 @@ BuildRequires: libkde4-devel BuildRequires: kde-filesystem BuildRequires: kdelibs4-devel %endif -Requires: plasma-widget-x2go +Requires: plasma-addons-x2go %if 0%{?el5} # For compatibility with EPEL5 @@ -38,13 +38,14 @@ X2Go is a server-based computing environment with This package adds a plasma widget (KDE4) for controlling your X2Go session. -%package -n plasma-widget-x2go +%package -n plasma-addons-x2go Summary: Plasma widget for control X2Go sessions Group: Applications/Communications Requires: hicolor-icon-theme Requires: x2goserver >= 3.1.1.2 +Conflicts: plasma-widget-x2go -%description -n plasma-widget-x2go +%description -n plasma-addons-x2go X2Go is a server-based computing environment with - session resuming - low bandwidth support @@ -66,6 +67,7 @@ cd build cmake .. \ -DCMAKE_INSTALL_PREFIX="%_prefix" \ -DCMAKE_INSTALL_LIBEXEC="%_libexecdir" \ + -DCMAKE_INSTALL_LIB="%_libdir" \ -DCMAKE_C_FLAGS:STRING="%optflags" \ -DCMAKE_CXX_FLAGS:STRING="%optflags" make %{?_smp_mflags} @@ -77,24 +79,24 @@ cd build make install DESTDIR=$RPM_BUILD_ROOT -%post -n plasma-widget-x2go +%post -n plasma-addons-x2go /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%postun -n plasma-widget-x2go +%postun -n plasma-addons-x2go if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%posttrans -n plasma-widget-x2go +%posttrans -n plasma-addons-x2go /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%files -n plasma-widget-x2go +%files -n plasma-addons-x2go %defattr(-,root,root) %doc debian/changelog %doc debian/copyright -%{_libexecdir}/ +%{_libdir}/ %{_datadir}/ %changelog -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
-
git-admin＠x2go.org