dist-git conversion

#2781)

Makefile

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

xbae.spec

@@ -10,7 +10,7 @@
 
 Name:           xbae
 Version:        4.60.4
-Release:        8%{?dist}
+Release:        8%{?dist}.1
 Summary:        Motif matrix, caption and text input widgets
 Group:          System Environment/Libraries
 # all the files are covered by the MIT license, except DebugUtil.c LGPLv2+
@@ -121,36 +121,36 @@ install -p -m644 ac_find_xbae.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal
 rm $RPM_BUILD_ROOT%{_libdir}/libXbae.la
 
 # prepare the main docs
-# Use systematically __fedora_* to avoid directory name clash.
-rm -rf __fedora_Xbae-docs
-mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __fedora_Xbae-docs
+# Use systematically __dist_* to avoid directory name clash.
+rm -rf __dist_Xbae-docs
+mv $RPM_BUILD_ROOT%{_datadir}/Xbae/ __dist_Xbae-docs
 # remove duplicate files already in %%doc
-rm __fedora_Xbae-docs/README
-rm __fedora_Xbae-docs/NEWS
+rm __dist_Xbae-docs/README
+rm __dist_Xbae-docs/NEWS
 # examples for builderXcessory are arch specific, this avoids clash of
 # doc files between arches
-mv __fedora_Xbae-docs/examples/builderXcessory __fedora_Xbae-docs/examples/builderXcessory-%{_arch}
+mv __dist_Xbae-docs/examples/builderXcessory __dist_Xbae-docs/examples/builderXcessory-%{_arch}
 
 # first clean examples
-rm -rf __fedora_examples
-cp -pr examples __fedora_examples
-make -C __fedora_examples clean
-find __fedora_examples -name '*akefile*' -exec rm {} \;
-rm __fedora_examples/extest
-rm __fedora_examples/testall
+rm -rf __dist_examples
+cp -pr examples __dist_examples
+make -C __dist_examples clean
+find __dist_examples -name '*akefile*' -exec rm {} \;
+rm __dist_examples/extest
+rm __dist_examples/testall
 
 # the builderXcessory directory is duplicated in the main doc and in the
 # example code. The master dir is considered to be in the main doc.
 # the README is better with the main examples doc, not in code examples
-mv __fedora_examples/builderXcessory/README __fedora_Xbae-docs/examples/builderXcessory-%{_arch}/
+mv __dist_examples/builderXcessory/README __dist_Xbae-docs/examples/builderXcessory-%{_arch}/
 # remove the duplicate dir and replace it with a link
-rm -rf __fedora_examples/builderXcessory/
-ln -s ../examples/builderXcessory-%{_arch}/ __fedora_examples/builderXcessory-%{_arch}
+rm -rf __dist_examples/builderXcessory/
+ln -s ../examples/builderXcessory-%{_arch}/ __dist_examples/builderXcessory-%{_arch}
 
 # then put the examples in a code_examples directory
-rm -rf __fedora_code_examples
-mkdir __fedora_code_examples
-mv __fedora_examples __fedora_code_examples/code_examples
+rm -rf __dist_code_examples
+mkdir __dist_code_examples
+mv __dist_examples __dist_code_examples/code_examples
 
 
 %clean
@@ -169,7 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc __fedora_Xbae-docs/* __fedora_code_examples/code_examples
+%doc __dist_Xbae-docs/* __dist_code_examples/code_examples
 %{_includedir}/Xbae/
 %{_libdir}/libXbae.so
 %{_mandir}/man*/Xbae*
@@ -177,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Aug 22 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-8
+* Wed Aug 22 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-8.1
 - fix license and source url
 
 * Wed Jul 25 2007 Patrice Dumas <pertusus@free.fr> 4.60.4-7