rpms/sbackup/devel import.log, NONE, 1.1 sbackup-0.10.5-locales.patch, NONE, 1.1 sbackup-0.10.5-prefix.patch, NONE, 1.1 sbackup-conf.desktop, NONE, 1.1 sbackup-restore.desktop, NONE, 1.1 sbackup.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Simon Wesp cassmodiah at fedoraproject.org
Mon Jan 19 14:18:07 UTC 2009


Author: cassmodiah

Update of /cvs/pkgs/rpms/sbackup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log sbackup-0.10.5-locales.patch 
	sbackup-0.10.5-prefix.patch sbackup-conf.desktop 
	sbackup-restore.desktop sbackup.spec 
Log Message:



--- NEW FILE import.log ---
sbackup-0_10_5-5_fc10:HEAD:sbackup-0.10.5-5.fc10.src.rpm:1232374701

sbackup-0.10.5-locales.patch:

--- NEW FILE sbackup-0.10.5-locales.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 01:12:14.000000000 +0100
@@ -1,4 +1,4 @@
-PO = pt_BR lv nl es sv fr
+PO = ca en_GB gl it ms pl sv zh_CN cs es hu lv nb pt_BR tr zh_TW de fr id nl pt uk
 
 ifndef DESTDIR
 	DESTDIR = /usr/local

sbackup-0.10.5-prefix.patch:

--- NEW FILE sbackup-0.10.5-prefix.patch ---
--- sbackup-0.10.5.orig/Makefile	2008-06-15 17:39:25.000000000 +0200
+++ sbackup-0.10.5/Makefile	2009-01-16 02:48:40.000000000 +0100
@@ -5,17 +5,18 @@
 endif 
 
 PREFIX = /usr/local
-BIN = $(DESTDIR)/sbin/
-SUPPORT = $(DESTDIR)/share/sbackup/
-DOC = $(DESTDIR)/share/doc/sbackup/
-PIXDIR = $(DESTDIR)/share/pixmaps/
+BIN = $(DESTDIR)/$(PREFIX)/sbin/
+SUPPORT = $(DESTDIR)/$(PREFIX)/share/sbackup/
+DOC = $(DESTDIR)/$(PREFIX)/share/doc/sbackup/
+PIXDIR = $(DESTDIR)/$(PREFIX)/share/pixmaps/
+SYSDIR = $(DESTDIR)/etc
 
 all:
 
 default:
 
 install: po-data install-po 
-	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/share/applications $(DESTDIR)/etc
+	install -d $(BIN) $(SUPPORT) $(DOC) $(PIXDIR) $(DESTDIR)/$(PREFIX)/share/applications $(SYSDIR)
 	install ./sbackupd.py $(SUPPORT)
 	ln -s ../share/sbackup/sbackupd.py $(BIN)/sbackupd
 	install ./simple-backup-config.py $(SUPPORT)
@@ -30,16 +31,16 @@
 	install -m644 -D simple-backup-config.glade $(SUPPORT)
 	install -m644 -D sbackup-conf.png $(PIXDIR)
 	install -m644 -D sbackup-restore.png $(PIXDIR)
-	install -m644 -D sbackup.desktop $(DESTDIR)/share/applications/
-	install -m644 -D srestore.desktop $(DESTDIR)/share/applications/
+	install -m644 -D sbackup.desktop $(DESTDIR)/$(PREFIX)/share/applications/
+	install -m644 -D srestore.desktop $(DESTDIR)/$(PREFIX)/share/applications/
 	install -m644 -D simple-restore.glade $(SUPPORT)
 	install ./sbackup $(SUPPORT)
 #	install -m644 -D simple-backup-tocd.glade $(SUPPORT)
-ifeq ($(DESTDIR),/usr/local/)
-	install -b -m600 sbackup.conf.example /etc/sbackup.conf
-	@echo "[places]" >> /etc/sbackup.conf
-	@echo "prefix=$(PREFIX)" >> /etc/sbackup.conf
-endif
+#ifeq ($(DESTDIR),/usr/local/)
+	install -D -m644 sbackup.conf.example $(SYSDIR)/sbackup.conf
+	@echo "[places]" >> $(SYSDIR)/sbackup.conf
+	@echo "prefix=$(PREFIX)" >> $(SYSDIR)/sbackup.conf
+#endif
 
 uninstall:
 	rm -f $(BIN)/sbackupd
@@ -61,8 +62,8 @@
 	-rm -f *~ *.bak
 
 install-po:
-	for lang in $(PO); do install -d $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
-	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -d $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
+	for lang in $(PO); do install -m 644 po/$$lang/LC_MESSAGES/* $(DESTDIR)/$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ ; done
 
 po-dir:
 	for lang in $(PO); do mkdir -p po/$$lang/LC_MESSAGES/ ; done


--- NEW FILE sbackup-conf.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Config
Comment=Configuration tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Einstellung der Simple Backup Suite
Exec=simple-backup-config
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-conf
GenericName=Backup Properties
GenericName[de]=Sicherungseinstellungen


--- NEW FILE sbackup-restore.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Simple Backup Restore
Comment=Restore tool for Simple Backup Suite
Comment[de]=Hilfsprogramm zur Wiederherstellung der Sicherungskopien
Exec=simple-restore-gnome
Terminal=false
Type=Application
Categories=System;Settings;GNOME;GTK;
StartupNotify=true
Icon=sbackup-restore
GenericName=Restore files and directories
GenericName[de]=Verzeichnisse und Dateien wiederherstellen


--- NEW FILE sbackup.spec ---
%define sbc simple-backup-config
%define srg simple-restore-gnome

Name:           sbackup
Version:        0.10.5
Release:        5%{?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
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  gettext
Requires:       usermode-gtk
Requires:       pygtk2-libglade
Requires:       gettext
Requires:       gvfs

%description
Simple Backup Suite is a set of backend backup daemon and GNOME
GUI frontends that provide a simple yet powerful backup
solution for common desktop users.

Backups can be written to local directory or remote servers using
GNOME VFS technology. A fine control is possible regarding what
folders and files to backup. Files can be excluded even with a set
of regular expressions. Regular backups can be scheduled.


%prep
%setup -q
%patch0 -p1 
%patch1 -p1


%build
%install
rm -rf %{buildroot}
make 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 \
        %{buildroot}%{_mandir}/man8/%{name}.8.gz

rm -rf %{buildroot}%{_datadir}/applications/*
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE1}
desktop-file-install \
                     %if 0%{?rhel}
                     --vendor="" \
                     %endif
                     --dir=%{buildroot}%{_datadir}/applications \
                     %{SOURCE2}

mkdir -p %{buildroot}%{_bindir}
ln -s consolehelper %{buildroot}%{_bindir}/%{sbc}
ln -s consolehelper %{buildroot}%{_bindir}/%{srg}

mkdir -p %{buildroot}%{_sysconfdir}/pam.d

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{sbc}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{srg}
#%PAM-1.0
auth            include         config-util
account         include         config-util
session         include         config-util
EOF

mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{sbc}
USER=root
PROGRAM=%{_sbindir}/%{sbc}
SESSION=true
EOF

cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{srg}
USER=root
PROGRAM=%{_sbindir}/%{srg}
SESSION=true
EOF

mkdir -p %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/
touch %{buildroot}%{_sysconfdir}/{cron.d,cron.daily,cron-hourly,cron.monthly,cron.weekly}/%{name}

%find_lang %{name}


%clean
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}
%{_mandir}/man8/%{name}.8.gz
%{_datadir}/applications/%{name}*.desktop
%{_datadir}/pixmaps/%{name}-conf.png
%{_datadir}/pixmaps/%{name}-restore.png
%{_datadir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}.conf
%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
* Fri Jan 16 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-5
- Add ownage for cron-files
- Correct patch0
- Add patch1 
- Correct desktopfiles

* Mon Jan 05 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-4
- Add Source0 again, to honor timestamp for Source0
- Require usermode-gtk instead of usermode for the password dialog.
 
* Wed Nov 26 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-3
- Add patch0
- Add manpage
- Add translations

* Sat Nov 01 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-2
- adjust for EPEL

* Fri Oct 24 2008 Simon Wesp <cassmodiah at fedoraproject.org> - 0.10.5-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2009 22:28:39 -0000	1.1
+++ .cvsignore	19 Jan 2009 14:17:37 -0000	1.2
@@ -0,0 +1 @@
+sbackup_0.10.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sbackup/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2009 22:28:39 -0000	1.1
+++ sources	19 Jan 2009 14:17:37 -0000	1.2
@@ -0,0 +1 @@
+0d754b72da3b5cadf6de203cdf7afe13  sbackup_0.10.5.tar.gz




More information about the fedora-extras-commits mailing list