[cairo-commit] cairo ChangeLog,1.900,1.901 Makefile.am,1.20,1.21

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv13287

Modified Files:
	ChangeLog Makefile.am 
Log Message:

2005-08-18  Carl Worth  <cworth at cworth.org>

        * Makefile.am: Clear setgid bit on regular files prior to tarring
        up a release.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -d -r1.900 -r1.901
--- ChangeLog	18 Aug 2005 04:19:30 -0000	1.900
+++ ChangeLog	18 Aug 2005 15:22:29 -0000	1.901
@@ -1,3 +1,8 @@
+2005-08-18  Carl Worth  <cworth at cworth.org>
+
+	* Makefile.am: Clear setgid bit on regular files prior to tarring
+	up a release.
+
 2005-08-18  Kristian Høgsberg  <krh at redhat.com>
 
 	* configure.in: Fix typo in freetype configure check.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.am	13 Aug 2005 15:12:18 -0000	1.20
+++ Makefile.am	18 Aug 2005 15:22:29 -0000	1.21
@@ -43,11 +43,6 @@
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
-release-remove-old:
-	rm -f $(tar_file) $(sha1_file) $(gpg_file)
-
-release-check: release-verify-even-micro release-verify-newer release-remove-old distcheck
-
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(CAIRO_VERSION_MICRO)" = "`echo $(CAIRO_VERSION_MICRO)/2*2 | bc`" \
@@ -65,6 +60,18 @@
 		&& false)
 	@echo "Good."
 
+release-remove-old:
+	rm -f $(tar_file) $(sha1_file) $(gpg_file)
+
+# Maybe it's just my system, but somehow group sticky bits keep
+# getting set and this causes failures in un-tarring on some systems.
+# Until I figure out where the sticky bit is coming from, just clean
+# these up before building a release.
+release-cleanup-group-sticky:
+	find . -type f | xargs chmod g-s
+
+release-check: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky distcheck
+
 release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	mkdir -p releases
 	scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
@@ -99,4 +106,4 @@
 	@echo "Last but not least, do not forget to bump up the micro"
 	@echo "version component to the next (odd) number and commit."
 
-.PHONY: release-check release-remove-old release-verify-even-micro release-verify-newer release-check release-publish release-upload
+.PHONY: release-verify-even-micro release-verify-newer release-remove-old release-cleanup-group-sticky release-check release-upload release-publish