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 089b02c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce-mcs-manager -# $Id$ -NAME := xfce-mcs-manager -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/xfce-mcs-manager.spec b/xfce-mcs-manager.spec index ed80d7b..26ed530 100644 --- a/xfce-mcs-manager.spec +++ b/xfce-mcs-manager.spec @@ -1,7 +1,7 @@ Summary: Multi channel settings manager Name: xfce-mcs-manager Version: 4.4.3 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce-mcs-manager-%{version}.tar.bz2 @@ -39,7 +39,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xfce4 +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/xfce4/modules mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/xfce4/doc @@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/applications/* %dir %{_libdir}/xfce4 +%dir %{_libdir}/xfce4/modules %dir %{_datadir}/xfce4 %dir %{_datadir}/xfce4/doc @@ -68,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/xfce4/xfce-mcs-manager %changelog +* Fri Jan 30 2009 Christoph Wickert - 4.4.3-1.1 +- Own %%{_libdir}/xfce4/modules (#474587) + * Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 - Update to 4.4.3 - BuildRequire intltool