rpms/ccache/devel ccache-3.0pre1-strip.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ccache.spec, 1.27, 1.28 sources, 1.4, 1.5 ccache-3.0pre0-nostrip.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2416

Modified Files:
	.cvsignore ccache.spec sources 
Added Files:
	ccache-3.0pre1-strip.patch 
Removed Files:
	ccache-3.0pre0-nostrip.patch 
Log Message:
* Thu May 13 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre1
- Update to 3.0pre1 (#591040), license changed to GPLv3+.


ccache-3.0pre1-strip.patch:
 Makefile.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ccache-3.0pre1-strip.patch ---
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/
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	1 Mar 2010 22:38:42 -0000	1.4
+++ .cvsignore	13 May 2010 18:57:13 -0000	1.5
@@ -1 +1 @@
-ccache-3.0pre0.tar.bz2
+ccache-3.0pre1.tar.bz2


Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ccache.spec	1 Mar 2010 22:38:44 -0000	1.27
+++ ccache.spec	13 May 2010 18:57:13 -0000	1.28
@@ -6,16 +6,17 @@
 
 Name:           ccache
 Version:        3.0
-Release:        0.1.pre0%{?dist}
+Release:        0.1.pre1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre0.tar.bz2
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre1.tar.bz2
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-Patch0:         %{name}-3.0pre0-nostrip.patch
+# 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)
@@ -33,7 +34,7 @@ being done again.  The main focus is to 
 
 
 %prep
-%setup -q -n %{name}-%{version}pre0
+%setup -q -n %{name}-%{version}pre1
 %patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
@@ -41,8 +42,6 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@
     %{SOURCE2} > %{name}.csh
 # Make sure system zlib is used
 rm -r zlib
-# Unclean 3.0pre0 tarball
-rm -r .deps
 
 
 %build
@@ -52,7 +51,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT STRIP=:
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
@@ -95,7 +94,7 @@ done
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc COPYING NEWS README
+%doc COPYING NEWS.txt README.txt
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -104,6 +103,9 @@ done
 
 
 %changelog
+* Thu May 13 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre1
+- Update to 3.0pre1 (#591040), license changed to GPLv3+.
+
 * Mon Mar  1 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0-0.1.pre0
 - Update to 3.0pre0, all old patches applied/superseded upstream.
   Note: old caches will no longer be used, see NEWS for details.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	1 Mar 2010 22:38:44 -0000	1.4
+++ sources	13 May 2010 18:57:13 -0000	1.5
@@ -1 +1 @@
-3704f1cd486b1e63638fd17910c42e9f  ccache-3.0pre0.tar.bz2
+8df2b11277f88e91a3d861d06b92a030  ccache-3.0pre1.tar.bz2


--- ccache-3.0pre0-nostrip.patch DELETED ---