rpms/thunar-vcs-plugin/F-10 thunar-vcs-plugin-0.1.1-git-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thunar-vcs-plugin.spec, 1.3, 1.4
Christoph Wickert
cwickert at fedoraproject.org
Sat Oct 24 15:40:44 UTC 2009
- Previous message (by thread): rpms/gtkmm24/F-12 .cvsignore, 1.36, 1.37 gtkmm.spec, 1.57, 1.58 sources, 1.38, 1.39
- Next message (by thread): rpms/thunar-vcs-plugin/F-12 thunar-vcs-plugin-0.1.1-git-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thunar-vcs-plugin.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/thunar-vcs-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4698/F-10
Modified Files:
.cvsignore sources thunar-vcs-plugin.spec
Added Files:
thunar-vcs-plugin-0.1.1-git-icons.patch
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
- Update to 0.1.1
- Include git icons
thunar-vcs-plugin-0.1.1-git-icons.patch:
16x16/Makefile.am | 8 ++++----
16x16/Makefile.in | 41 ++++++++++++++++++++++-------------------
24x24/Makefile.am | 2 ++
24x24/Makefile.in | 1 +
48x48/Makefile.am | 2 ++
48x48/Makefile.in | 1 +
6 files changed, 32 insertions(+), 23 deletions(-)
--- NEW FILE thunar-vcs-plugin-0.1.1-git-icons.patch ---
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.am 2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.am 2009-10-24 17:12:49.000000000 +0200
@@ -1,8 +1,8 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA = \
+ git.png
EXTRA_DIST = \
- $(apps_DATA)
+ $(icons_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/16x16/Makefile.in 2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/16x16/Makefile.in 2009-10-24 17:19:43.000000000 +0200
@@ -68,8 +68,8 @@
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(appsdir)"
-DATA = $(apps_DATA)
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(icons_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -239,10 +239,13 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA = \
+ git.png \
+ subversion.png
+
EXTRA_DIST = \
- $(apps_DATA)
+ $(icons_DATA)
all: all-am
@@ -283,26 +286,26 @@
clean-libtool:
-rm -rf .libs _libs
-install-appsDATA: $(apps_DATA)
+install-iconsDATA: $(icons_DATA)
@$(NORMAL_INSTALL)
- test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
- @list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+ test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
done
-uninstall-appsDATA:
+uninstall-iconsDATA:
@$(NORMAL_UNINSTALL)
- @list='$(apps_DATA)'; test -n "$(appsdir)" || list=; \
+ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -344,7 +347,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(appsdir)"; do \
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -392,7 +395,7 @@
info-am:
-install-data-am: install-appsDATA
+install-data-am: install-iconsDATA
install-dvi: install-dvi-am
@@ -436,21 +439,21 @@
ps-am:
-uninstall-am: uninstall-appsDATA
+uninstall-am: uninstall-iconsDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-appsDATA install-data install-data-am install-dvi \
+ install-iconsDATA install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-appsDATA
+ uninstall uninstall-am uninstall-iconsDATA
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.am 2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.am 2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
iconsdir = $(datadir)/icons/hicolor/24x24/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
$(icons_DATA)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/24x24/Makefile.in 2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/24x24/Makefile.in 2009-10-24 17:06:34.000000000 +0200
@@ -241,6 +241,7 @@
top_srcdir = @top_srcdir@
iconsdir = $(datadir)/icons/hicolor/24x24/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.am 2009-08-14 23:43:30.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.am 2009-10-24 17:04:43.000000000 +0200
@@ -1,7 +1,9 @@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
$(icons_DATA)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff -dur thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in
--- thunar-vcs-plugin-0.1.1.orig/icons/48x48/Makefile.in 2009-10-23 21:20:36.000000000 +0200
+++ thunar-vcs-plugin-0.1.1/icons/48x48/Makefile.in 2009-10-24 17:05:45.000000000 +0200
@@ -241,6 +241,7 @@
top_srcdir = @top_srcdir@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 19 Oct 2009 17:01:21 -0000 1.2
+++ .cvsignore 24 Oct 2009 15:40:44 -0000 1.3
@@ -1 +1,2 @@
-thunar-vcs-plugin-0.1.0.tar.bz2
+thunar-vcs-plugin-0.1.1.tar.bz2
+git-icons.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 19 Oct 2009 17:01:21 -0000 1.2
+++ sources 24 Oct 2009 15:40:44 -0000 1.3
@@ -1 +1,2 @@
-90d1f2d414c2b4b8bf211a8a6b13b358 thunar-vcs-plugin-0.1.0.tar.bz2
+00b3ea668a11136644aaa588318fb0f4 thunar-vcs-plugin-0.1.1.tar.bz2
+402d74f1e34b6ca3a53d42f71b32079b git-icons.tar.gz
Index: thunar-vcs-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunar-vcs-plugin/F-10/thunar-vcs-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- thunar-vcs-plugin.spec 21 Oct 2009 16:42:50 -0000 1.3
+++ thunar-vcs-plugin.spec 24 Oct 2009 15:40:44 -0000 1.4
@@ -1,14 +1,19 @@
# Review: https://bugzilla.redhat.com/show_bug.cgi?id=529465
Name: thunar-vcs-plugin
-Version: 0.1.0
-Release: 1%{?dist}.1
-Summary: SVN integration for the Thunar filemanager
+Version: 0.1.1
+Release: 1%{?dist}
+Summary: Version Contol System plugin for the Thunar filemanager
Group: User Interface/Desktops
License: GPLv2+
URL: http://goodies.xfce.org/projects/thunar-plugins/%{name}
Source0: http://archive.xfce.org/src/thunar-plugins/%{name}/0.1/%{name}-%{version}.tar.bz2
+# Created some icons and sent them upstream
+Source1: git-icons.tar.gz
+# Upstream changed the Makefile to install the new icons
+# http://git.xfce.org/thunar-plugins/thunar-vcs-plugin/commit/?id=3aa180a79c07d4855f6c779ac951d047dc164b10
+Patch0: thunar-vcs-plugin-0.1.1-git-icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: Thunar-devel >= 0.4.0
@@ -20,28 +25,29 @@ BuildRequires: uuid-devel
BuildRequires: libuuid-devel
%endif
BuildRequires: gettext, intltool
-Requires: Thunar >= 0.9.0
+Requires: Thunar >= 1.0.0
Requires: subversion
# Obsolete thunar-svn-plugin for smooth upgrades
Provides: thunar-svn-plugin = %{version}-%{release}
Obsoletes: thunar-svn-plugin < 0.0.4-1
%description
-The Thunar VCS Plugin adds Subversion actions to the context menu of Thunar.
-This gives a SVN integration to Thunar. The current features are:
-* Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
- export, import, lock, log, move, properties, relocate, resolved, revert,
- status, switch, unlock and update.
-* Subversion info in file properties dialog.
+The Thunar VCS Plugin adds Subversion and GIT actions to the context menu of
+Thunar. This gives a VCS integration to Thunar. The current features are:
+* Most of the SVN actions: add, blame, checkout, cleanup, commit, copy,
+ delete, export, import, lock, log, move, properties, relocate, resolved,
+ revert, status, switch, unlock and update
+* Subversion info in file properties dialog
+* Basic GIT actions: add, branch, clone, log, reset, status
This project was formerly known as Thunar SVN Plugin.
%prep
-%setup -q
-
+%setup -q -a 1
+%patch0 -p1 -b .git-icons
%build
-%configure --disable-static
+%configure --disable-static --enable-subversion --enable-git
# remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -80,12 +86,15 @@ gtk-update-icon-cache %{_datadir}/icons/
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/thunarx-1/%{name}.so
%{_libexecdir}/tvp-svn-helper
+%{_libexecdir}/tvp-git-helper
%{_datadir}/icons/hicolor/*/apps/subversion.png
+%{_datadir}/icons/hicolor/*/apps/git.png
%changelog
-* Wed Oct 21 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1.1
-- Fix Thunar dependency
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-1
+- Update to 0.1.1
+- Include git icons
* Wed Sep 30 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
- Initial Fedora package
- Previous message (by thread): rpms/gtkmm24/F-12 .cvsignore, 1.36, 1.37 gtkmm.spec, 1.57, 1.58 sources, 1.38, 1.39
- Next message (by thread): rpms/thunar-vcs-plugin/F-12 thunar-vcs-plugin-0.1.1-git-icons.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thunar-vcs-plugin.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list