From f4f7bcad767e7182fcca721ec00b528ed33c36cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 3 Jul 2010 12:02:48 +0000
Subject: [PATCH] - Update to 3.0, no-strip patch no longer needed.

---
 .cvsignore                 |  2 +-
 ccache-3.0pre1-strip.patch | 21 ---------------------
 ccache.spec                | 12 ++++++------
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 ccache-3.0pre1-strip.patch

diff --git a/.cvsignore b/.cvsignore
index 4f997fe..6e37d49 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-3.0pre1.tar.bz2
+ccache-3.0.tar.bz2
diff --git a/ccache-3.0pre1-strip.patch b/ccache-3.0pre1-strip.patch
deleted file mode 100644
index df3304f..0000000
--- a/ccache-3.0pre1-strip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ccache-3.0pre1/Makefile.in~ ccache-3.0pre1/Makefile.in
---- ccache-3.0pre1/Makefile.in~	2010-05-10 23:08:12.000000000 +0300
-+++ ccache-3.0pre1/Makefile.in	2010-05-13 20:31:38.000000000 +0300
-@@ -13,6 +13,7 @@ CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@ -I.
- LDFLAGS = @LDFLAGS@
- EXEEXT = @EXEEXT@
-+STRIP = strip
- 
- libs = @LIBS@ -lm
- 
-@@ -47,7 +48,8 @@ ccache.1: manual.xml
- .PHONY: install
- install: all
- 	$(installcmd) -d $(DESTDIR)$(bindir)
--	$(installcmd) -s -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(STRIP) $(DESTDIR)$(bindir)/ccache$(EXEEXT)
- 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
- 	-$(installcmd) -m 644 $(srcdir)/ccache.1 $(DESTDIR)$(mandir)/man1/
- 
diff --git a/ccache.spec b/ccache.spec
index 1635c6d..f9db4ee 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,17 +6,15 @@
 
 Name:           ccache
 Version:        3.0
-Release:        0.2.pre1%{?dist}
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
 License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre1.tar.bz2
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-# https://bugzilla.samba.org/show_bug.cgi?id=7428
-Patch0:         %{name}-3.0pre1-strip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -34,8 +32,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
-%patch0 -p1
+%setup -q
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -103,6 +100,9 @@ done
 
 
 %changelog
+* Sat Jul  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-1
+- Update to 3.0, no-strip patch no longer needed.
+
 * Fri Jun  4 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.2.pre1
 - Reintroduce minor profile.d script performance improvements.
 
diff --git a/sources b/sources
index c1573fc..25d6611 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8df2b11277f88e91a3d861d06b92a030  ccache-3.0pre1.tar.bz2
+213bd7420f913e4c926eeac9cd2dadf6  ccache-3.0.tar.bz2