From 7105b77a35f0acc782efb86658fdf36e71a364da Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:51:12 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for alltray --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 4d88800a735fadc4df87bb4cbb2a16b43aa7ba32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:43:53 +0000 Subject: [PATCH 2/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 969a50d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alltray -# $Id: Makefile,v 1.1 2005/12/30 22:59:38 ivazquez Exp $ -NAME := alltray -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 56b32c84b21de0039b3275920ad789949541164c Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Thu, 12 Aug 2010 11:25:33 +0530 Subject: [PATCH 3/3] new upstream --- .gitignore | 1 + alltray-0.70_new_ld.patch | 21 --------------------- alltray.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 alltray-0.70_new_ld.patch diff --git a/.gitignore b/.gitignore index 66ee4d1..c389c66 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ alltray-0.70.tar.gz +alltray-0.71a.tar.gz diff --git a/alltray-0.70_new_ld.patch b/alltray-0.70_new_ld.patch deleted file mode 100644 index 0545708..0000000 --- a/alltray-0.70_new_ld.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur alltray-0.70/configure alltray-0.70.new_ld/configure ---- alltray-0.70/configure 2010-02-16 11:54:10.052362926 -0500 -+++ alltray-0.70.new_ld/configure 2010-02-16 11:52:11.332352095 -0500 -@@ -21248,7 +21248,7 @@ - if test "$user_disabled_gconf" = 1; then - { echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6; } -- pkg_modules="gtk+-2.0 >= 2.2.0 gdk-2.0 gdk-pixbuf-xlib-2.0" -+ pkg_modules="gtk+-2.0 >= 2.2.0 gdk-2.0 gdk-pixbuf-xlib-2.0 x11" - else - { echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6; } -@@ -21257,7 +21257,7 @@ - #define GCONF_NOT_DISABLED 1 - _ACEOF - -- pkg_modules="gtk+-2.0 >= 2.2.0 gdk-2.0 gconf-2.0 gdk-pixbuf-xlib-2.0" -+ pkg_modules="gtk+-2.0 >= 2.2.0 gdk-2.0 gconf-2.0 gdk-pixbuf-xlib-2.0 x11" - fi - - diff --git a/alltray.spec b/alltray.spec index 94e5af1..bbe8be2 100644 --- a/alltray.spec +++ b/alltray.spec @@ -1,13 +1,12 @@ Name: alltray -Version: 0.70 -Release: 5%{?dist} +Version: 0.71a +Release: 1%{?dist} Summary: Dock any application in the tray Group: User Interface/Desktops License: GPLv2+ URL: http://alltray.sourceforge.net/ Source0: http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz -Patch1: alltray-0.70_new_ld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,7 +20,6 @@ system tray. It works well with GNOME, KDE, XFCE 4, Fluxbox, and WindowMaker. %prep %setup -q -%patch1 -p1 -b .new_ld %build export CFLAGS="-fPIC $RPM_OPT_FLAGS" @@ -58,7 +56,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/%{name}.png %changelog -* Tue Feb 16 2019 Huzaifa Sidhpurwala - 0.70-5 +* Thu Aug 12 2010 Huzaifa Sidhpurwala - 0.71a-1 +- New upstream + +* Tue Feb 16 2010 Huzaifa Sidhpurwala - 0.70-5 - Fix rhbz #564621: ImplicitDSOLinking * Fri Jul 24 2009 Fedora Release Engineering - 0.70-4 diff --git a/sources b/sources index c2a01bf..91ffc2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -675a0a60f22fae04da787095ef0bd7d9 alltray-0.70.tar.gz +39a81402c258d41e2538f7ca8df58fac alltray-0.71a.tar.gz