[backintime/el6] Initial build for EL6

Tim Jackson timj at fedoraproject.org
Sat Jul 21 19:55:51 UTC 2012


commit 65379b7f9ea421bae7a0fcda22a6e2d0ca8b98d6
Author: Tim Jackson <rpm at timj.co.uk>
Date:   Sat Jul 21 21:55:05 2012 +0200

    Initial build for EL6
    
    - Make KDE build conditional
    - Fix the incorrect displayed version number when running the program

 backintime.spec |  141 ++++++++++++++++++------------------------------------
 1 files changed, 47 insertions(+), 94 deletions(-)
---
diff --git a/backintime.spec b/backintime.spec
index e3c7b45..d183d54 100644
--- a/backintime.spec
+++ b/backintime.spec
@@ -1,27 +1,26 @@
 Name:            backintime
 Version:         1.0.8
-Release:         3%{?dist}
-Summary:         Simple backup tool 
+Release:         4%{?dist}
+Summary:         Simple backup tool
 
 Group:           Applications/Archiving
 License:         GPLv2+
 URL:             http://backintime.le-web.org/
 Source0:         http://backintime.le-web.org/download/%{name}/%{name}-%{version}_src.tar.gz
 BuildArch:       noarch
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:   desktop-file-utils
 BuildRequires:   gettext
 
 
 %description
-Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. The backup is done by taking 
-snapshots of a specified set of directories.
+Back In Time is a simple backup system for Linux inspired by the "flyback"
+project and "TimeVault". The backup is done by taking snapshots of a specified
+set of directories.
 
 
 %package         common
-Summary:         Common files for the %{name}, a simple backup tool
+Summary:         Common files for %{name}, a simple backup tool
 Group:           Applications/Archiving
 Requires:        python
 Requires:        rsync
@@ -29,11 +28,11 @@ Requires:        cronie
 
 
 %description     common
-Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. The backup is done by taking 
-snapshots of a specified set of directories.
+Back In Time is a simple backup system for Linux inspired by the "flyback"
+project and "TimeVault". The backup is done by taking snapshots of a specified
+set of directories.
 
-This package contains non GUI files used by different GUI frontends.
+This package contains non-GUI files used by different GUI frontends.
 
 
 %package         gnome
@@ -49,13 +48,13 @@ Requires:        gnome-python2-gnome
 
 
 %description     gnome
-Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. The backup is done by taking 
-snapshots of a specified set of directories.
-
-This package contains the GNOME frontend
+Back In Time is a simple backup system for Linux inspired by the "flyback"
+project and "TimeVault". The backup is done by taking snapshots of a specified
+set of directories.
 
+This package contains the GNOME frontend.
 
+%if 0%{?_with_kde}
 %package         kde
 Summary:         KDE frontend for %{name}, a simple backup tool
 Group:           Applications/Archiving
@@ -65,26 +64,30 @@ Requires:        PyKDE4
 Requires:        usermode-gtk
 Requires:        kdesdk
 
-
 %description     kde
-Back In Time is a simple backup system for Linux inspired from 
-“flyback project” and “TimeVault”. The backup is done by taking 
-snapshots of a specified set of directories.
-
-This package contains the KDE frontend
+Back In Time is a simple backup system for Linux inspired by the "flyback"
+project and "TimeVault". The backup is done by taking snapshots of a specified
+set of directories.
 
+This package contains the KDE frontend.
+%endif
 
 %prep
 %setup -q
 
+# Upstream forgot to bump the displayed version number in 1.0.8 release;
+# this causes user confusion so we fix it
+sed -i s/1.0.7/1.0.8/ common/config.py
+
 sed -i 's|Exec=gksu backintime-gnome|Exec=backintime-gnome-root|g' \
        gnome/%{name}-gnome-root.desktop
 
+%if 0%{?_with_kde}
 cp kde4/%{name}-kde4.desktop kde4/%{name}-kde4-root.desktop
 
 sed -i 's|Exec=backintime-kde4|Exec=backintime-kde4-root|g' \
        kde4/%{name}-kde4-root.desktop
-
+%endif
 
 %build
 cd common
@@ -95,9 +98,11 @@ cd ../gnome
 %configure --no-check
 make %{?_smp_mflags}
 
+%if 0%{?_with_kde}
 cd ../kde4
 %configure --no-check
 make %{?_smp_mflags}
+%endif
 
 cd ..
 
@@ -116,11 +121,13 @@ make install \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}/%{_prefix}"
 
+%if 0%{?_with_kde}
 cd ../kde4
 make install \
      INSTALL="install -p" \
      PREFIX="%{_prefix}" \
      DEST="%{buildroot}/%{_prefix}"
+%endif
 
 cd ..
 
@@ -133,6 +140,7 @@ desktop-file-install \
         --add-category="Settings;" \
         %{buildroot}/%{_datadir}/applications/%{name}-gnome-root.desktop
 
+%if 0%{?_with_kde}
 desktop-file-install \
         --dir=%{buildroot}/%{_datadir}/applications/kde4 \
         %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4.desktop
@@ -141,18 +149,22 @@ desktop-file-install \
         --dir=%{buildroot}/%{_datadir}/applications/kde4 \
         --add-category="Settings;" \
         %{buildroot}/%{_datadir}/applications/kde4/%{name}-kde4-root.desktop
+%endif
 
 mkdir -p %{buildroot}%{_sbindir}
 cp -p %{buildroot}%{_bindir}/%{name}-gnome \
       %{buildroot}%{_sbindir}/%{name}-gnome-root
-cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
-      %{buildroot}%{_sbindir}/%{name}-kde4-root
 
 ln -s consolehelper \
       %{buildroot}%{_bindir}/%{name}-gnome-root
 
+%if 0%{?_with_kde}
+cp -p %{buildroot}%{_bindir}/%{name}-kde4 \
+      %{buildroot}%{_sbindir}/%{name}-kde4-root
+      
 ln -s consolehelper \
       %{buildroot}%{_bindir}/%{name}-kde4-root
+%endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps/
 
@@ -162,11 +174,13 @@ PROGRAM=%{_sbindir}/%{name}-gnome-root
 SESSION=true
 EOF
 
+%if 0%{?_with_kde}
 cat << EOF > %{buildroot}%{_sysconfdir}/security/console.apps/%{name}-kde4-root
 USER=root
 PROGRAM=%{_sbindir}/%{name}-kde4-root
 SESSION=true
 EOF
+%endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 
@@ -177,18 +191,17 @@ account         include         config-util
 session         include         config-util
 EOF
 
+%if 0%{?_with_kde}
 cat << EOF > %{buildroot}%{_sysconfdir}/pam.d/%{name}-kde4-root
 #%PAM-1.0
 auth            include         config-util
 account         include         config-util
 session         include         config-util
 EOF
+%endif
 
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
-
 
 %files common -f %{name}.lang
 %defattr(-,root,root,-)
@@ -215,7 +228,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-gnome-root
 %config %{_sysconfdir}/security/console.apps/%{name}-gnome-root
 
-
+%if 0%{?_with_kde}
 %files kde
 %defattr(-,root,root,-)
 %{_bindir}/%{name}-kde4
@@ -228,71 +241,11 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-kde4/
 %config(noreplace) %{_sysconfdir}/pam.d/%{name}-kde4-root
 %config %{_sysconfdir}/security/console.apps/%{name}-kde4-root
-
+%endif
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Oct 09 2011 Tim Jackson <rpm at timj.co.uk> - 1.0.8-2
-- Add missing dependency on gnome-python2-gnome (rhbz#720577)
-
-* Sun Oct 09 2011 Tim Jackson <rpm at timj.co.uk> - 1.0.8-1
-- Update to version 1.0.8
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Feb 03 2011 Tim Jackson <rpm at timj.co.uk> - 1.0.6-3
-- Fix bad ownership of language files (RHBZ #569407)
-
-* Wed Feb 02 2011 Tim Jackson <rpm at timj.co.uk> - 1.0.6-2
-- Fix error if notify-python is not installed (RHBZ #630969)
-
-* Wed Feb 02 2011 Tim Jackson <rpm at timj.co.uk> - 1.0.6-1
-- Update to version 1.0.6
-
-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.9.26-4
-- recompiling .py files against Python 2.7 (rhbz#623275)
-
-* Wed Sep 02 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.26-3
-- Add patch0 to secure backups
-
--* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.26-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Sat May 23 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.26-1
-- New upstream release
-- Drop 'removecheck'-patch
-
-* Sun May 17 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.24-3
-- Fix sammries, RHBZ #501085
-
-* Tue May 12 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.24-2
-- fix doc issues, LP #375113
-
-* Thu May 07 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.24-1
-- 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" 
-- Change description of kde package to "KDE frontend for NAME"
-- Add TRANSLATIONS to DOC of common package
-- Mark _DATADIR/gnome/help/NAME as DOC
-- Mark _DATADIR/doc/kde4/HTML/en/NAME as DOC
-- Use cp -p when copying from bindir to sbindir
-
-* Wed Apr 22 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.22-1
-- New upstream release
-- Add Patch to remove the Desktopchecks in configure
-
-* Mon Apr 06 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.20-1
-- New upstream release
-- Add consolehelperstuff for root-access
-
-* Tue Mar 17 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.16.1-1
-- New upstream release
+* Sat Jul 21 2012 Tim Jackson <rpm at timj.co.uk> - 1.0.8-4
+- Initial build for EL6
+- Make KDE build conditional
+- Fix the incorrect displayed version number when running the program
 
-* Tue Mar 10 2009 Simon Wesp <cassmodiah at fedoraproject.org> - 0.9.14-1
-- Initial Package build


More information about the scm-commits mailing list