Skip to content

Commit

Permalink
Merge branch 'jb39430' into 'master'
Browse files Browse the repository at this point in the history 
[buteo-sync-plugins-social] Prevent failure in %pre. Contributes to JB#39430

See merge request !26
  • Loading branch information
chriadam committed Oct 4, 2017
2 parents d1e145a + af82948 commit 8be13ad
Showing 1 changed file with 49 additions and 49 deletions.
98 changes: 49 additions & 49 deletions rpm/sociald.spec
View file
Expand Up @@ -58,8 +58,8 @@ Provides calendar synchronisation with Facebook
%config %{_sysconfdir}/buteo/profiles/sync/facebook.Calendars.xml

%pre facebook-calendars
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/facebook.Calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-calendars.xml || :
rm -f /home/nemo/.cache/msyncd/sync/facebook.Calendars.xml || :

%post facebook-calendars
systemctl-user try-restart msyncd.service || :
Expand All @@ -85,8 +85,8 @@ Provides contact synchronisation with Facebook
%config %{_sysconfdir}/buteo/profiles/sync/facebook.Contacts.xml

%pre facebook-contacts
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/facebook.Contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-contacts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/facebook.Contacts.xml || :

%post facebook-contacts
systemctl-user try-restart msyncd.service || :
Expand All @@ -110,8 +110,8 @@ Provides image synchronisation with Facebook
%config %{_sysconfdir}/buteo/profiles/sync/facebook.Images.xml

%pre facebook-images
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-images.xml
rm -f /home/nemo/.cache/msyncd/sync/facebook.Images.xml
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-images.xml || :
rm -f /home/nemo/.cache/msyncd/sync/facebook.Images.xml || :

%post facebook-images
systemctl-user try-restart msyncd.service || :
Expand All @@ -138,8 +138,8 @@ Provides notification synchronisation with Facebook
%{_datadir}/lipstick/notificationcategories/x-nemo.social.facebook.notification.conf

%pre facebook-notifications
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/facebook.Notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-notifications.xml || :
rm -f /home/nemo/.cache/msyncd/sync/facebook.Notifications.xml || :

%post facebook-notifications
systemctl-user try-restart msyncd.service || :
Expand All @@ -165,8 +165,8 @@ Provides signon credentials refreshing with Facebook
%config %{_sysconfdir}/buteo/profiles/sync/facebook.Signon.xml

%pre facebook-signon
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-signon.xml
rm -f /home/nemo/.cache/msyncd/sync/facebook.Signon.xml
rm -f /home/nemo/.cache/msyncd/sync/client/facebook-signon.xml || :
rm -f /home/nemo/.cache/msyncd/sync/facebook.Signon.xml || :

%post facebook-signon
systemctl-user try-restart msyncd.service || :
Expand All @@ -193,8 +193,8 @@ Provides calendar synchronisation with Google
%config %{_sysconfdir}/buteo/profiles/sync/google.Calendars.xml

%pre google-calendars
rm -f /home/nemo/.cache/msyncd/sync/client/google-calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/google.Calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/client/google-calendars.xml || :
rm -f /home/nemo/.cache/msyncd/sync/google.Calendars.xml || :

%post google-calendars
systemctl-user try-restart msyncd.service || :
Expand All @@ -220,8 +220,8 @@ Provides contact synchronisation with Google
%config %{_sysconfdir}/buteo/profiles/sync/google.Contacts.xml

%pre google-contacts
rm -f /home/nemo/.cache/msyncd/sync/client/google-contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/google.Contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/google-contacts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/google.Contacts.xml || :

%post google-contacts
systemctl-user try-restart msyncd.service || :
Expand All @@ -246,8 +246,8 @@ Provides signon credentials refreshing with Google
%config %{_sysconfdir}/buteo/profiles/sync/google.Signon.xml

%pre google-signon
rm -f /home/nemo/.cache/msyncd/sync/client/google-signon.xml
rm -f /home/nemo/.cache/msyncd/sync/google.Signon.xml
rm -f /home/nemo/.cache/msyncd/sync/client/google-signon.xml || :
rm -f /home/nemo/.cache/msyncd/sync/google.Signon.xml || :

%post google-signon
systemctl-user try-restart msyncd.service || :
Expand Down Expand Up @@ -280,8 +280,8 @@ Provides notification synchronisation with Twitter
%{_datadir}/translations/lipstick-jolla-home-twitter-notif_eng_en.qm

%pre twitter-notifications
rm -f /home/nemo/.cache/msyncd/sync/client/twitter-notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/twitter.Notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/client/twitter-notifications.xml || :
rm -f /home/nemo/.cache/msyncd/sync/twitter.Notifications.xml || :

%post twitter-notifications
systemctl-user try-restart msyncd.service || :
Expand Down Expand Up @@ -309,8 +309,8 @@ Provides post synchronisation with Twitter
%{_datadir}/lipstick/notificationcategories/x-nemo.social.twitter.tweet.conf

%pre twitter-posts
rm -f /home/nemo/.cache/msyncd/sync/client/twitter-posts.xml
rm -f /home/nemo/.cache/msyncd/sync/twitter.Posts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/twitter-posts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/twitter.Posts.xml || :

%post twitter-posts
systemctl-user try-restart msyncd.service || :
Expand All @@ -335,8 +335,8 @@ Provides signon credentials refreshing with OneDrive
%config %{_sysconfdir}/buteo/profiles/sync/onedrive.Signon.xml

%pre onedrive-signon
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-signon.xml
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Signon.xml
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-signon.xml || :
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Signon.xml || :

%post onedrive-signon
systemctl-user try-restart msyncd.service || :
Expand Down Expand Up @@ -365,8 +365,8 @@ Provides post synchronisation with VK
%config %{_sysconfdir}/buteo/profiles/sync/vk.Posts.xml

%pre vk-posts
rm -f /home/nemo/.cache/msyncd/sync/client/vk-posts.xml
rm -f /home/nemo/.cache/msyncd/sync/vk.Posts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/vk-posts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/vk.Posts.xml || :

%post vk-posts
systemctl-user restart msyncd.service || :
Expand All @@ -389,8 +389,8 @@ Provides image synchronisation with Dropbox
%config %{_sysconfdir}/buteo/profiles/sync/dropbox.Images.xml

%pre dropbox-images
rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-images.xml
rm -f /home/nemo/.cache/msyncd/sync/dropbox.Images.xml
rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-images.xml || :
rm -f /home/nemo/.cache/msyncd/sync/dropbox.Images.xml || :

%post dropbox-images
systemctl-user try-restart msyncd.service || :
Expand All @@ -413,8 +413,8 @@ Provides image synchronisation with OneDrive
%config %{_sysconfdir}/buteo/profiles/sync/onedrive.Images.xml

%pre onedrive-images
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-images.xml
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Images.xml
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-images.xml || :
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Images.xml || :

%post onedrive-images
systemctl-user try-restart msyncd.service || :
Expand All @@ -440,8 +440,8 @@ Provides backup-blob synchronization for OneDrive
%config %{_sysconfdir}/buteo/profiles/sync/onedrive.Backup.xml

%pre onedrive-backup
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-backup.xml
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Backup.xml
rm -f /home/nemo/.cache/msyncd/sync/client/onedrive-backup.xml || :
rm -f /home/nemo/.cache/msyncd/sync/onedrive.Backup.xml || :

%post onedrive-backup
systemctl-user try-restart msyncd.service || :
Expand All @@ -467,8 +467,8 @@ Provides backup-blob synchronization for Dropbox
%config %{_sysconfdir}/buteo/profiles/sync/dropbox.Backup.xml

%pre dropbox-backup
rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-backup.xml
rm -f /home/nemo/.cache/msyncd/sync/dropbox.Backup.xml
rm -f /home/nemo/.cache/msyncd/sync/client/dropbox-backup.xml || :
rm -f /home/nemo/.cache/msyncd/sync/dropbox.Backup.xml || :

%post dropbox-backup
systemctl-user try-restart msyncd.service || :
Expand Down Expand Up @@ -496,8 +496,8 @@ Provides notification synchronisation with VK
%{_datadir}/lipstick/notificationcategories/x-nemo.social.vk.notification.conf

%pre vk-notifications
rm -f /home/nemo/.cache/msyncd/sync/client/vk-notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/vk.Notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/client/vk-notifications.xml || :
rm -f /home/nemo/.cache/msyncd/sync/vk.Notifications.xml || :

%post vk-notifications
systemctl-user restart msyncd.service || :
Expand All @@ -523,8 +523,8 @@ Provides calendar synchronisation with VK
%config %{_sysconfdir}/buteo/profiles/sync/vk.Calendars.xml

%pre vk-calendars
rm -f /home/nemo/.cache/msyncd/sync/client/vk-calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/vk.Calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/client/vk-calendars.xml || :
rm -f /home/nemo/.cache/msyncd/sync/vk.Calendars.xml || :

%post vk-calendars
systemctl-user restart msyncd.service || :
Expand All @@ -550,8 +550,8 @@ Provides contact synchronisation with VK
%config %{_sysconfdir}/buteo/profiles/sync/vk.Contacts.xml

%pre vk-contacts
rm -f /home/nemo/.cache/msyncd/sync/client/vk-contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/vk.Contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/vk-contacts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/vk.Contacts.xml || :

%post vk-contacts
systemctl-user restart msyncd.service || :
Expand All @@ -575,8 +575,8 @@ Provides image synchronisation with VK
%config %{_sysconfdir}/buteo/profiles/sync/vk.Images.xml

%pre vk-images
rm -f /home/nemo/.cache/msyncd/sync/client/vk-images.xml
rm -f /home/nemo/.cache/msyncd/sync/vk.Images.xml
rm -f /home/nemo/.cache/msyncd/sync/client/vk-images.xml || :
rm -f /home/nemo/.cache/msyncd/sync/vk.Images.xml || :

%post vk-images
systemctl-user restart msyncd.service || :
Expand Down Expand Up @@ -618,15 +618,15 @@ Automatable tests for sociald
make %{_smp_mflags}

%pre
rm -f /home/nemo/.cache/msyncd/sync/client/sociald.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Images.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Notifications.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Posts.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Calendars.xml
rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Contacts.xml
rm -f /home/nemo/.cache/msyncd/sync/client/sociald.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Calendars.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Contacts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Images.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.facebook.Notifications.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Notifications.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.twitter.Posts.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Calendars.xml || :
rm -f /home/nemo/.cache/msyncd/sync/sociald.google.Contacts.xml || :

%install
rm -rf %{buildroot}
Expand Down

0 comments on commit 8be13ad

Please sign in to comment.