diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 511d5a0..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -xfconf-4.6.1.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bff547b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xfconf-4.6.2.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index fd79ce4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfconf -# $Id$ -NAME := xfconf -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) diff --git a/import.log b/import.log deleted file mode 100644 index 63166e1..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xfconf-4_5_92-4_fc11:HEAD:xfconf-4.5.92-4.fc11.src.rpm:1231811349 diff --git a/sources b/sources index 3b4f484..c3ba2c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4d3018767ea9eb4b57cc57d4038023b xfconf-4.6.1.tar.bz2 +5ff93c15077c6dbbcd38c437bc1ab2ef xfconf-4.6.2.tar.bz2 diff --git a/xfconf.spec b/xfconf.spec index 21c6140..40bede6 100644 --- a/xfconf.spec +++ b/xfconf.spec @@ -1,12 +1,12 @@ Name: xfconf -Version: 4.6.1 -Release: 3%{?dist} +Version: 4.6.2 +Release: 1%{?dist} Summary: Hierarchical configuration system for Xfce Group: System Environment/Base License: GPLv2 URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfconf-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/xfconf/4.6/xfconf-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel @@ -14,7 +14,10 @@ BuildRequires: libxfce4util-devel = %{version} BuildRequires: dbus-devel BuildRequires: dbus-glib-devel BuildRequires: perl(ExtUtils::Depends) perl(ExtUtils::PkgConfig) perl(Glib) +BuildRequires: perl(ExtUtils::MakeMaker) perl(Glib::MakeHelper) BuildRequires: gettext +BuildRequires: intltool + Requires: dbus-x11 Obsoletes: libxfce4mcs < 4.4.3-3 @@ -112,6 +115,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 21 2010 Kevin Fenzi - 4.6.2-1 +- Update to 4.6.2 + +* Mon Dec 7 2009 Stepan Kasal - 4.6.1-5 +- rebuild against perl 5.10.1 + +* Tue Oct 20 2009 Orion Poplawski - 4.6.1-4 +- Add BR perl(ExtUtils::MakeMaker) and perl(Glib::MakeHelper) + * Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild