dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfce4-icon-theme
-# $Id$
-NAME := xfce4-icon-theme
-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 $$/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)

xfce4-icon-theme.spec

@@ -1,10 +1,11 @@
 Summary: Icons for Xfce
 Name: xfce4-icon-theme
 Version: 4.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-icon-theme-%{version}.tar.bz2
+Patch0: xfce4-icon-theme-4.4.3-fedora.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -18,6 +19,7 @@ Icon theme for Xfce 4 Desktop Environment.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fedora
 
 %build
 %configure
@@ -40,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc
 
 %changelog
+* Fri Apr 17 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.4.3-3
+- Inherit default distribution icon theme (#489402)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild