[sbackup/f12/master] New version! (#655189 and #655190).
mrceresa
mrceresa at fedoraproject.org
Thu Nov 25 18:17:57 UTC 2010
commit 6ec0d6bb34081470ba9401bcd003c605a577b225
Author: Mario Ceresa <mrceresa at gmail.com>
Date: Thu Nov 25 19:18:01 2010 +0100
New version! (#655189 and #655190).
.gitignore | 1 +
sbackup-0.10.5-deactivate_dpkg.patch | 31 ----
sbackup-0.10.5-locales.patch | 8 -
sbackup-0.10.5-prefix.patch | 61 -------
...p-if-destination-directory-does-not-exist.patch | 14 --
sbackup-0.10.5-save_on_backup.patch | 10 -
sbackup-0.10.5-stopifnotarget.patch | 13 --
sbackup-0.11.3-prefix.patch | 176 ++++++++++++++++++++
sbackup.spec | 60 +++----
sources | 2 +-
10 files changed, 204 insertions(+), 172 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9e5317..c1d0dfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sbackup_0.10.5.tar.gz
+/sbackup_0.11.3.tar.gz
diff --git a/sbackup-0.11.3-prefix.patch b/sbackup-0.11.3-prefix.patch
new file mode 100644
index 0000000..f3adb43
--- /dev/null
+++ b/sbackup-0.11.3-prefix.patch
@@ -0,0 +1,176 @@
+--- Makefile.bck 2010-11-25 18:13:46.009312715 +0100
++++ Makefile 2010-11-25 18:14:53.936530608 +0100
+@@ -45,9 +45,9 @@
+ PREFIX=/usr/local
+ DESTDIR=/usr/local
+
+-datadir=$(DESTDIR)/share
+-bindir=$(DESTDIR)/bin
+-sbindir=$(DESTDIR)/sbin
++datadir=$(DESTDIR)/$(PREFIX)/share
++bindir=$(DESTDIR)/$(PREFIX)/bin
++sbindir=$(DESTDIR)/$(PREFIX)/sbin
+
+ libdir=$(datadir)/$(PKGNAME)
+ helpdir=$(datadir)/gnome/help/$(PKGNAME)
+@@ -55,7 +55,7 @@
+ icondir=$(datadir)/icons
+ gconf_schema_file_dir=$(datadir)/gconf/schemas
+
+-sysconf_dir=/etc
++sysconf_dir=$(DESTDIR)/etc
+ dbus_system_conf_dir=$(sysconf_dir)/dbus-1/system.d
+
+ gconf_schema_file=apps_sbackup_global-preferences.schemas
+@@ -63,11 +63,6 @@
+
+ iconslst=sbackup-panel.png sbackup-attention.png sbackup-success.png
+
+-gtk_update_icon_cache=if test "$(DISABLE_MAKEFILE_GTK_UPDATE_ICON_CACHE)" = ""; then \
+- gtk-update-icon-cache -f -t $(icondir)/hicolor; \
+- gtk-update-icon-cache -f -t $(icondir)/ubuntu-mono-light; \
+- gtk-update-icon-cache -f -t $(icondir)/ubuntu-mono-dark; fi
+-
+ # distutils options
+ SETUP.PY_OPTS=--root=/ --install-lib $(libdir) -O0
+
+@@ -98,12 +93,7 @@
+ set -e; sed s+ at pkgname@+$(PKGNAME)+ src/sbackup/metainfo.tmp > src/sbackup/metainfo
+ rm -f data/desktop/*.tmp src/sbackup/*.tmp *.tmp
+
+-check:
+- @echo "Check for another installation of sbackup"
+- @set -e; for lang in $(DESTDIR)/sbin/sbackupd $(DESTDIR)/bin/sbackup $(DESTDIR)/../sbin/sbackupd $(DESTDIR)/../bin/sbackup; do echo " checking: $$lang"; if [ -e $$lang ]; then echo "Another installation of sbackup is present. Please uninstall first."; exit 1; fi ; done
+- @set -e; for lang in $(DESTDIR)/bin/nssbackupd $(DESTDIR)/../bin/nssbackupd; do echo " checking: $$lang"; if [ -e $$lang ]; then echo "Another installation of nssbackup is present. Please uninstall first."; exit 1; fi ; done
+-
+-install: check install-package install-po install-help install-bin install-data
++install: install-package install-po install-help install-bin install-data
+ chmod +x $(libdir)/multipleTarScript
+ chmod +x $(libdir)/sbackup-launch
+ chmod +x $(libdir)/sbackup-dbusservice
+@@ -127,7 +117,7 @@
+
+ # python package
+ install-package:
+- $(PYTHON) setup.py install ${SETUP.PY_OPTS} --prefix=$(PREFIX)
++ $(PYTHON) setup.py install ${SETUP.PY_OPTS} --prefix=$(DESTDIR)/$(PREFIX)
+
+ # localization
+ install-po:
+@@ -147,116 +137,20 @@
+
+ # additional data/configuration
+ install-data: install-icons install-dbus install-gconf
+- @if test "$(DISABLE_MAKEFILE_DESKTOP_DATABASE_RELOAD)" = ""; then \
+- update-desktop-database; fi
+
+ install-icons:
+ install -d $(icondir)/hicolor/24x24/apps/ $(icondir)/ubuntu-mono-light/apps/24/ $(icondir)/ubuntu-mono-dark/apps/24/
+ set -e; for icon in $(iconslst); do install -m 644 data/icons/hicolor/24x24/$$icon $(icondir)/hicolor/24x24/apps/ ; done
+ set -e; for icon in $(iconslst); do install -m 644 data/icons/ubuntu-mono-light/24/$$icon $(icondir)/ubuntu-mono-light/apps/24/ ; done
+ set -e; for icon in $(iconslst); do install -m 644 data/icons/ubuntu-mono-dark/24/$$icon $(icondir)/ubuntu-mono-dark/apps/24/ ; done
+- $(gtk_update_icon_cache)
+
+ install-dbus:
+ install -d $(dbus_system_conf_dir)
+ install -m 644 data/$(dbus_system_conf_file) $(dbus_system_conf_dir)
+- @if test "$(DISABLE_MAKEFILE_DBUS_RELOAD)" = ""; then \
+- if [ -x $(servicetool) ]; then \
+- $(servicetool) dbus force-reload; \
+- else if [ -r /etc/init.d/dbus ]; then \
+- invoke-rc.d dbus force-reload; fi; fi; \
+- fi
+
+ install-gconf:
+ install -d $(gconf_schema_file_dir)
+ install -m 644 data/$(gconf_schema_file) $(gconf_schema_file_dir)
+- @if test "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" = ""; then \
+- gconf-schemas --register $(gconf_schema_file_dir)/$(gconf_schema_file); \
+- fi
+-
+-
+-# targets for un-installation
+-uninstall: uninstall-package uninstall-bin uninstall-data uninstall-help clean-data
+-
+-uninstall-bin:
+- rm -f $(bindir)/sbackup
+- rm -f $(bindir)/sbackup-config-gtk
+- rm -f $(bindir)/sbackup-restore-gtk
+- rm -f $(bindir)/sbackup-upgrade-backups
+- rm -f $(sbindir)/sbackupconfig
+-
+-uninstall-package:
+- rm -rf $(libdir)
+-
+-uninstall-data: uninstall-icons uninstall-dbus uninstall-gconf
+- rm -f $(datadir)/pixmaps/sbackup-restore.png
+- rm -f $(datadir)/pixmaps/sbackup-conf.png
+- rm -f $(datadir)/pixmaps/sbackup.png
+- rm -f $(datadir)/pixmaps/sbackup32x32.png
+- rm -f $(datadir)/applications/sbackup-config*.desktop
+- rm -f $(datadir)/applications/sbackup-restore*.desktop
+- rm -rf $(datadir)/doc/sbackup
+- set -e; find $(langdir) -name sbackup.mo -exec rm -f '{}' \;
+-
+-uninstall-icons:
+- set -e; for icon in $(iconslst); do rm -f $(icondir)/hicolor/24x24/apps/$$icon ; done
+- set -e; for icon in $(iconslst); do rm -f $(icondir)/ubuntu-mono-light/apps/24/$$icon ; done
+- set -e; for icon in $(iconslst); do rm -f $(icondir)/ubuntu-mono-dark/apps/24/$$icon ; done
+- $(gtk_update_icon_cache)
+-
+-uninstall-dbus:
+- rm -f $(dbus_system_conf_dir)/$(dbus_system_conf_file)
+-
+-#FIXME: treat gconf schema file as proper conffile?
+-uninstall-gconf:
+- @if test "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" = ""; then \
+- if test -r "$(gconf_schema_file_dir)/$(gconf_schema_file)"; then \
+- gconf-schemas --unregister $(gconf_schema_file_dir)/$(gconf_schema_file); fi; \
+- fi
+- rm -f $(gconf_schema_file_dir)/$(gconf_schema_file)
+-
+-
+-uninstall-help:
+- rm -rf $(helpdir)
+-
+-clean-data: clean-crondata clean-tmpdata
+-
+-# remove script/symlinks from cron directory
+-clean-crondata:
+- @if test "$(DISABLE_MAKEFILE_CLEAN_DATA)" = ""; then \
+- rm -f /etc/cron.d/sbackup; \
+- rm -f /etc/cron.hourly/sbackup; \
+- rm -f /etc/cron.daily/sbackup; \
+- rm -f /etc/cron.weekly/sbackup; \
+- rm -f /etc/cron.monthly/sbackup; fi
+-
+-clean-tmpdata:
+- @if test "$(DISABLE_MAKEFILE_CLEAN_DATA)" = ""; then \
+- rm -rf /var/log/sbackup; \
+- rm -f /var/log/sbackup-*.log; \
+- rm -f /var/log/sbackup-*.log.*.gz; \
+- rm -rf /tmp/sbackup; fi
+-
+-purge-user-config:
+- rm -f /etc/sbackup.conf
+- rm -rf /etc/sbackup.d
+-
+-
+-reinstall: uninstall install
+-
+-
+-# clean source code directory
+-clean:
+- set -e; find . -name '*.py[co]' -exec rm -f '{}' \;
+- set -e; find . -name '*~' -exec rm -f '{}' \;
+- set -e; find . -name '*.bak' -exec rm -f '{}' \;
+- rm -rf build dist setup.py
+- rm -f data/desktop/sbackup-config*.desktop
+- rm -f data/desktop/sbackup-restore*.desktop
+- rm -f src/sbackup/resources
+- rm -f src/sbackup/metainfo
+- rm -rf src/sbackup.egg-info
+- set -e; for lang in $(PO); do rm -rf po/$$lang ; done
+
+ # Purpose of this target is to print some informational data
+ show-infos:
diff --git a/sbackup.spec b/sbackup.spec
index 87cd9b6..c7fe537 100644
--- a/sbackup.spec
+++ b/sbackup.spec
@@ -1,24 +1,17 @@
-%global sbc simple-backup-config
-%global srg simple-restore-gnome
+%define sbc simple-backup-config
+%define srg simple-restore-gnome
Name: sbackup
-Version: 0.10.5
-Release: 10%{?dist}
+Version: 0.11.3
+Release: 1%{?dist}
Summary: Simple Backup Suite for desktop use
-
Group: Applications/Archiving
License: GPLv2+
URL: http://sbackup.wiki.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: %{name}-conf.desktop
Source2: %{name}-restore.desktop
-Patch0: %{name}-0.10.5-locales.patch
-Patch1: %{name}-0.10.5-prefix.patch
-Patch2: %{name}-0.10.5-save_on_backup.patch
-Patch3: %{name}-0.10.5-deactivate_dpkg.patch
-Patch4: %{name}-0.10.5-remeber-Abort-backup-if-destination-directory-does-not-exist.patch
-Patch5: %{name}-0.10.5-stopifnotarget.patch
-
+Patch1: %{name}-0.11.3-prefix.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,24 +35,17 @@ of regular expressions. Regular backups can be scheduled.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
+%patch1
%build
+make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
make install \
- INSTALL="install -p" \
DESTDIR=%{buildroot} \
PREFIX=%{_prefix}
-
-
mkdir -p %{buildroot}%{_mandir}/man8/
cat simple-backup.8 | gzip -9 -c > %{name}.8.gz
install -pm644 %{name}.8.gz \
@@ -116,6 +102,8 @@ EOF
mkdir -p %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/
touch %{buildroot}%{_sysconfdir}/cron.{d,daily,hourly,monthly,weekly}/%{name}
+rm -rf %{buildroot}/%{_docdir}/%{name}/
+
%find_lang %{name}
@@ -125,33 +113,37 @@ rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO VERSION
-%{_bindir}/%{sbc}
-%{_bindir}/%{srg}
-%{_sbindir}/%{name}d
-%{_sbindir}/%{sbc}
-%{_sbindir}/%{srg}
+%doc AUTHORS COPYING TODO README HACKING
+%{_bindir}/*
+%{_sbindir}/*
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}32x32.png
%{_datadir}/%{name}/
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%{_datadir}/gconf/schemas/apps_sbackup_global-preferences.schemas
+%{_datadir}/gnome/help/%{name}/C/*
+%{_datadir}/icons/hicolor/24x24/apps/*.png
+%{_datadir}/icons/ubuntu-mono-dark/apps/24/*.png
+%{_datadir}/icons/ubuntu-mono-light/apps/24/*.png
+
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/*
%config(noreplace) %{_sysconfdir}/pam.d/%{sbc}
%config %{_sysconfdir}/security/console.apps/%{sbc}
%config(noreplace) %{_sysconfdir}/pam.d/%{srg}
%config %{_sysconfdir}/security/console.apps/%{srg}
-%exclude %{_sbindir}/srestore.*
-%exclude %{_sbindir}/upgrade_backups.*
%ghost %{_sysconfdir}/cron.*/%{name}
%changelog
-* Sat Dec 12 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-10
-- Add patch to remember the setting 'Abort backup if destination directory does not exist' (RHBZ#517840)
+* Thu Nov 25 2010 Mario Ceresa mrceresa at gmail dot com - 0.11.3-1
+- Updated to new version and adapted specfile to new source code layout
+- Patched Makefile to install into buildroot and removed all install section from it.
* Thu Nov 26 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-9
-- Add patch to 'stop if no target' (RHBZ#540619) Thanks to Thomas Spura for this patch
+- add patch to 'stop if no target' (RHBZ#540619) Thanks to Thomas Spura for this patch
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index 3bec677..fb8675f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d754b72da3b5cadf6de203cdf7afe13 sbackup_0.10.5.tar.gz
+27f009a17d8e77043204c0e1c3290884 sbackup_0.11.3.tar.gz
More information about the scm-commits
mailing list