Author: kolodko                      Date: Sun Jun  1 15:03:05 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added snap bcond

---- Files affected:
SPECS:
   codeblocks.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/codeblocks.spec
diff -u SPECS/codeblocks.spec:1.22 SPECS/codeblocks.spec:1.23
--- SPECS/codeblocks.spec:1.22  Thu May 22 16:00:22 2008
+++ SPECS/codeblocks.spec       Sun Jun  1 17:03:00 2008
@@ -3,19 +3,31 @@
 #      - snap build from svn
 #      - review remains patches and Source1
 
-##%define              _rc     rc2
-##%define              _snap   20060721
+%bcond_with snap     # build snap instead of release
+
+%if %{with snap}
+%define                _svn    svn5082
+%define                _snap   20080531
+%endif
+
 Summary:       An open source, cross platform, free C++ IDE
 Summary(pl.UTF-8):     Wieloplatformowe, darmowe IDE do C++ o otwartych 
źródłach
 Name:          codeblocks
+%if %{with snap}
+Version:       1.0
+Release:       %{_snap}%{_svn}
+%else
 Version:       8.02
 Release:       0.1
-#Release:      0.%{_snap}
+%endif
 License:       GPL
 Group:         Development/Languages
-#Source0:      %{name}-%{_snap}.tar.gz
+%if %{with snap}
+Source0:       %{name}-%{_snap}.tar.gz
+%else
 Source0:       
http://dl.sourceforge.net/codeblocks/%{name}-%{version}-src.tar.bz2
 # Source0-md5: ac15b4b3de50d7650c2f7a8dbcb30f88
+%endif
 Patch0:                %{name}-FHS-plugins.patch
 #Source1:      %{name}.conf
 #Patch0:               %{name}-ac.patch
@@ -129,10 +141,16 @@
 instalować ten pakiet tylko w celu pisania wtyczek do Code::Blocks.
 
 %prep
+%if %{with snap}
+%setup -q -n %{name}-%{_snap}
+%else
 %setup -q -n %{name}-%{version}
-#%setup -q -n %{name}-%{_snap}
+%endif
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name 
"*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" 
-and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix
-chmod a+x acinclude.m4 src/update configure
+
+%if %{without snap}
+chmod -f a+x acinclude.m4 src/update configure
+%endif
 
 %patch0 -p1
 #%patch1 -p1
@@ -163,16 +181,20 @@
 find src/plugins/compilergcc -type f -exec chmod a-x {} ';'
 
 # fix version inside the configure script
-sed -i 's/1\.0svn/%{version}/g' configure
-
-# Because of new bootstrap script, crating revision.m4
-echo "m4_define([SVN_REVISION], trunk-r0)" > ./revision.m4
+#sed -i 's/1\.0svn/%{version}/g' configure
 
+%if %{with snap}
+chmod a+x update_revision.sh
+./update_revision.sh
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+%else
+# fix version inside the configure script
+sed -i 's/1\.0svn/%{version}/g' configure
+%endif
 %configure \
        --with-wx-config=wx-gtk2-unicode-config \
        --with-contrib-plugins=all
@@ -234,6 +256,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2008-06-01 15:03:00  kolodko
+- added snap bcond
+
 Revision 1.22  2008-05-22 14:00:22  kolodko
 - up to 8.02, rel 0.1
 - merged patches from RHEL
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/codeblocks.spec?r1=1.22&r2=1.23&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to