rpms/backintime/devel backintime-0.9.24-remove-checks.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 backintime.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 backintime-0.9.22-remove-checks.patch, 1.1, NONE

[Simon Wesp]

Author: cassmodiah

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

Modified Files:
	.cvsignore backintime.spec import.log sources 
Added Files:
	backintime-0.9.24-remove-checks.patch 
Removed Files:
	backintime-0.9.22-remove-checks.patch 
Log Message:


backintime-0.9.24-remove-checks.patch:

--- NEW FILE backintime-0.9.24-remove-checks.patch ---
diff -Naur backintime-0.9.24.orig/gnome/configure backintime-0.9.24/gnome/configure
--- backintime-0.9.24.orig/gnome/configure	2009-04-27 15:14:55.000000000 +0200
+++ backintime-0.9.24/gnome/configure	2009-05-07 18:08:46.000000000 +0200
@@ -5,10 +5,10 @@
 fi
 
 #check GNOME
-if [ -z `which gnome-session` ]; then
-	echo "ERROR: Can't find GNOME !"
-	exit 1
-fi
+#if [ -z `which gnome-session` ]; then
+#	echo "ERROR: Can't find GNOME !"
+#	exit 1
+#fi
 
 cp Makefile.template Makefile
 
diff -Naur backintime-0.9.24.orig/kde4/configure backintime-0.9.24/kde4/configure
--- backintime-0.9.24.orig/kde4/configure	2009-04-27 15:26:23.000000000 +0200
+++ backintime-0.9.24/kde4/configure	2009-05-07 18:08:41.000000000 +0200
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 #check KDE4
-if [ $kde4 = "--kde4" ]; then
-	if [ -z `which kdeinit4` ]; then
-		echo "ERROR: Can't find KDE4 !"
-		exit 1
-	fi
-fi
+#if [ $kde4 = "--kde4" ]; then
+#	if [ -z `which kdeinit4` ]; then
+#		echo "ERROR: Can't find KDE4 !"
+#		exit 1
+#	fi
+#fi
 
 cp Makefile.template Makefile
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Apr 2009 07:47:41 -0000	1.2
+++ .cvsignore	8 May 2009 11:23:13 -0000	1.3
@@ -1 +1 @@
-backintime-0.9.22_src.tar.gz
+backintime-0.9.24_src.tar.gz


Index: backintime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/backintime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- backintime.spec	27 Apr 2009 07:47:41 -0000	1.1
+++ backintime.spec	8 May 2009 11:23:13 -0000	1.2
@@ -1,13 +1,13 @@
 Name:            backintime
-Version:         0.9.22
-Release:         2%{?dist}
+Version:         0.9.24
+Release:         1%{?dist}
 Summary:         Simple backup system 
 
 Group:           Applications/Archiving
 License:         GPLv2+
 URL:             http://www.le-web.org/back-in-time/
 Source0:         http://www.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
-Patch0:          backintime-0.9.22-remove-checks.patch
+Patch0:          %{name}-0.9.24-remove-checks.patch
 BuildArch:       noarch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +26,7 @@ Summary:         Common files for %{name
 Group:           Applications/Archiving
 Requires:        python
 Requires:        rsync
+Requires:        cronie
 
 
 %description     common
@@ -61,27 +62,56 @@ KDE frontend for %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
-       %{name}-gnome-root.desktop
+       gnome/%{name}-gnome-root.desktop
 
 sed -i 's|Exec=kdesudo -c backintime-kde4|Exec=backintime-kde4-root|g' \
-       %{name}-kde4-root.desktop
+       kde4/%{name}-kde4-root.desktop
+
+sed -e 's!share/locale!.*/locale!' /usr/lib/rpm/find-lang.sh > my-find-lang.sh
+
+%patch0 -p1
+
 
 %build
-%configure --common --gnome --kde4
+cd common
+%configure
 make %{?_smp_mflags}
 
+cd ../gnome
+%configure
+make %{?_smp_mflags}
+
+cd ../kde4
+%configure
+make %{?_smp_mflags}
+
+cd ..
 
 %install
 rm -rf %{buildroot}
 
+cd common
+make install \
+     INSTALL="install -p" \
+     PREFIX="%{_prefix}" \
+     DEST="%{buildroot}/%{_prefix}"
+
+cd ../gnome
 make install \
      INSTALL="install -p" \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}/%{_prefix}"
 
+cd ../kde4
+make install \
+     INSTALL="install -p" \
+     PREFIX="%{_prefix}" \
+     DEST="%{buildroot}/%{_prefix}"
+
+cd ..
+
 rm -rf %{buildroot}/%{_docdir}/%{name}*
 
 desktop-file-install \
@@ -144,26 +174,26 @@ account         include         config-u
 session         include         config-util
 EOF
 
-%find_lang %{name}
+sh my-find-lang.sh %{buildroot} %{name} %{name}.lang
+find %{buildroot}/%{_datadir}/locale/ -mindepth 1 \
+    \( -name locale -prune \) -o \
+    -type d -printf '%%%%dir %{_datadir}/locale/%%P\n' -o \
+    ! -name '*.py' -printf '%{_datadir}/locale/%%P\n' -o \
+    -printf '%{_datadir}/locale/%%P\n' \
+    -printf '%{_datadir}/locale/%%P[co]\n' >> lang.lst
 
 %clean
 rm -rf %{buildroot}
 
 
-%files common -f %{name}.lang
+%files common -f lang.lst
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES LICENSE README TODO TRANSLATIONS
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}/
-%{_datadir}/%{name}/applicationinstance.*
-%{_datadir}/%{name}/%{name}.*
-%{_datadir}/%{name}/config.*
-%{_datadir}/%{name}/configfile.*
-%{_datadir}/%{name}/guiapplicationinstance.*
-%{_datadir}/%{name}/logger.*
-%{_datadir}/%{name}/snapshots.*
-%{_datadir}/%{name}/tools.*
-%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/%{name}/common/
+%{_datadir}/%{name}/plugins/
+%{_mandir}/man1/%{name}*
 
 
 %files gnome
@@ -174,7 +204,7 @@ rm -rf %{buildroot}
 %{_sbindir}/%{name}-gnome-root
 %{_datadir}/applications/%{name}-gnome.desktop
 %{_datadir}/applications/%{name}-gnome-root.desktop
-%{_datadir}/%{name}/gnome*
+%{_datadir}/%{name}/gnome/
 %doc %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
@@ -189,13 +219,16 @@ rm -rf %{buildroot}
 %{_sbindir}/%{name}-kde4-root
 %{_datadir}/applications/kde4/%{name}-kde4.desktop
 %{_datadir}/applications/kde4/%{name}-kde4-root.desktop
-%{_datadir}/backintime/kde4*
+%{_datadir}/backintime/kde4/
 %doc %{_datadir}/doc/kde4/HTML/en/%{name}/
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
 %config %{_sysconfdir}/security/console.apps/%{name}-kde4-root
 
 
 %changelog
+* Thu May 07 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.24-2
+- New upstream release
+
 * Sat Apr 25 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-2
 - Remove Patch for desktop-files and do the changes in spec-file
 - Change description of gnome package to "Gnome frontend for NAME" 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	27 Apr 2009 07:47:41 -0000	1.1
+++ import.log	8 May 2009 11:23:13 -0000	1.2
@@ -1 +1,2 @@
 backintime-0_9_22-2_fc10:HEAD:backintime-0.9.22-2.fc10.src.rpm:1240818291
+backintime-0_9_24-1_fc11:HEAD:backintime-0.9.24-1.fc11.src.rpm:1241781712


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/backintime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Apr 2009 07:47:41 -0000	1.2
+++ sources	8 May 2009 11:23:13 -0000	1.3
@@ -1 +1 @@
-d29aca14d0158f72e9585a895aa7bf10  backintime-0.9.22_src.tar.gz
+57a2d4639b82d89ac0c6246d8569adcf  backintime-0.9.24_src.tar.gz


--- backintime-0.9.22-remove-checks.patch DELETED ---