Attachment 483401 Details for Bug 680604 – gitg patch v2

[patch] gitg patch v2

gitg.patch (text/plain), 4.54 KB, created by Ignacio Casal Quinteiro (nacho) on 2011-03-10 09:49:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ignacio Casal Quinteiro (nacho)

Created: 2011-03-10 09:49:09 UTC

Size: 4.54 KB

patch

obsolete

>diff --git a/gitg.spec b/gitg.spec
>index 9dcead0..74d2c31 100644
>--- a/gitg.spec
>+++ b/gitg.spec
>@@ -1,39 +1,56 @@
> Name:           gitg
>-Version:        0.0.6
>-Release:        4%{?dist}
>+Version:        0.2.0
>+Release:        1%{?dist}
> Summary:        GTK+ graphical interface for the git revision control system
> 
> Group:          Development/Tools
> License:        GPLv2+
> URL:            http://trac.novowork.com/gitg
>-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.0/%{name}-%{version}.tar.bz2
>+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.2/%{name}-%{version}.tar.bz2
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  desktop-file-utils
> BuildRequires:  dbus-devel
>-BuildRequires:  GConf2-devel
>-BuildRequires:  gtk2-devel
>-BuildRequires:  gtksourceview2-devel
>+BuildRequires:  glib2-devel
>+BuildRequires:  gtk3-devel
>+BuildRequires:  gtksourceview3-devel
>+BuildRequires:  gsettings-desktop-schemas-devel
> BuildRequires:  intltool
> 
>-Requires(pre): GConf2
>-Requires(post): GConf2
>-Requires(preun): GConf2
>-
>+Requires:       %{name}-libgitg = %{Version}-%{Release}
> Requires:       git
>+Requires:       gsettings-desktop-schemas
> 
> %description
> gitg is a GitX clone for GNOME/gtk+. It aims at being a small, fast and
> convenient tool to visualize git history and actions that benefit from a
> graphical presentation.
> 
>+%package libgitg
>+Summary:        Backend Library for gitg
>+License:        GPLv2+
>+Group:          Development/Libraries
>+
>+%description libgitg
>+libgitg is a GObject based library that provides an easy access to git methods
>+through GObject based methods
>+
>+%package libgitg-devel
>+Summary:        Development files for %{name}-libgitg
>+License:        GPLv2+
>+Group:          Development/Libraries
>+
>+Requires:       %{name}-libgitg = %{Version}-%{Release}
>+
>+%description libgitg-devel
>+This package contains development files for %{name}-libgitg.
> 
> %prep
> %setup -q
> 
> 
> %build
>-%configure --disable-schemas
>+%configure
> make %{?_smp_mflags}
> 
> 
>@@ -52,37 +69,25 @@ desktop-file-install                                       \
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-
>-%pre
>-if [ "$1" -gt 1 ]; then
>-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gitg.schemas > /dev/null || :
>-fi
>-
>-
> %post
>-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gitg.schemas >  /dev/null || :
>-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
>-
>-
>-%preun
>-if [ "$1" -eq 0 ]; then
>-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gitg.schemas > /dev/null || :
>-fi
>-
>+update-desktop-database -q
>+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
> 
> %postun
>-if [ $1 -eq 0 ] ; then
>-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
>-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
>+update-desktop-database -q
>+if [ $1 -eq 0 ]; then
>+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
>+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
>+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
> fi
> 
>-
> %posttrans
>-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
>+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
>+glib-compile-schemas %{_datadir}/glib-2.0/schemas
>+
>+%post libgitg -p /sbin/ldconfig
> 
>+%postun libgitg -p /sbin/ldconfig
> 
> %files -f %{name}.lang
> %defattr(-,root,root,-)
>@@ -99,11 +104,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> %{_datadir}/icons/hicolor/48x48/apps/gitg.png
> %{_datadir}/icons/hicolor/scalable/apps/gitg.svg
> 
>-%{_sysconfdir}/gconf/schemas/gitg.schemas
>+%{_datadir}/glib-2.0/schemas/org.gnome.gitg.gschema.xml
>+
> %{_datadir}/applications/gitg.desktop
> 
>+%files libgitg
>+%defattr(-,root,root,-)
>+%doc COPYING
>+%{_libdir}/libgitg-1.0.*
>+
>+%files libgitg-devel
>+%defattr(-,root,root,-)
>+%doc COPYING
>+%{_libdir}/pkgconfig/libgitg-1.0.pc
>+
>+%{_includedir}/libgitg-1.0
> 
> %changelog
>+* Tue Feb 08 2011 Ignacio Casal Quinteiro <icq@gnome.org> - 0.2.0-1
>+- update to 0.2.0
>+
> * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.6-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 6fb70e9..b0b6016 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-5aab2b6fc97d72f2063f91f12dc014d8  gitg-0.0.6.tar.bz2
>+6d2b78d7686a84b52d7316c5eedf3ba1  gitg-0.2.0.tar.bz2

Actions: View | Diff

Attachments on bug 680604: 483312 | 483401 | 483404