rpms/xinha/F-11 xinha.spec,1.1,1.2

Matthew Daniels danielsmw at fedoraproject.org
Sun Dec 6 17:00:46 UTC 2009


Author: danielsmw

Update of /cvs/pkgs/rpms/xinha/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27393

Modified Files:
	xinha.spec 
Log Message:
Edited the release tag with a dist macro and changed usage of release to alphtag throughout.



Index: xinha.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xinha/F-11/xinha.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinha.spec	3 Nov 2009 19:10:07 -0000	1.1
+++ xinha.spec	6 Dec 2009 17:00:46 -0000	1.2
@@ -1,6 +1,8 @@
+%global alphatag 0.1.b2
+
 Name:		xinha
 Version:	0.96
-Release:	0.1.b2
+Release:	0.1.b2%{?dist}.1
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
@@ -13,7 +15,7 @@ URL:		http://www.xinha.org
 #  svn export -r 1191 http://svn.xinha.org/trunk %{name}-%{version}-%{release}
 #  tar -czf %{name}-%{version}-%{release}.tar.gz %{name}-%{version}-%{release}/*
 
-Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{release}.tar.gz
+Source0:	http://fedorahosted.org/release/x/i/%{name}-%{version}-%{alphatag}.tar.gz
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -34,33 +36,33 @@ HTML. It can be used on its own or as pa
 Scribite.
 
 %prep
-%setup -q -c -n %{name}-%{version}-%{release} -a 0
+%setup -q -c -n %{name}-%{version}-%{alphatag} -a 0
 cp -p %SOURCE1 .
 
 # Remove precompiled binaries and other illegal files
-find %{name}-%{version}-%{release} | grep \.jar$ | xargs rm
-find %{name}-%{version}-%{release} | grep \.htaccess$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.jar$ | xargs rm
+find %{name}-%{version}-%{alphatag} | grep \.htaccess$ | xargs rm
 
 # Fix permissions on non-executables
-find %{name}-%{version}-%{release} | grep \.js$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.php$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.css$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.html$ | xargs chmod a-x
-find %{name}-%{version}-%{release} | grep \.svg$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.js$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.php$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.css$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.html$ | xargs chmod a-x
+find %{name}-%{version}-%{alphatag} | grep \.svg$ | xargs chmod a-x
 
 # Remove plugins that contain unresolvable dependecies
-rm -rf %{name}-%{version}-%{release}/plugins/ImageManager/
-rm -rf %{name}-%{version}-%{release}/plugins/ExtendedFileManager/
-rm -rf %{name}-%{version}-%{release}/unsupported_plugins/
-rm -rf %{name}-%{version}-%{release}/contrib/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ImageManager/
+rm -rf %{name}-%{version}-%{alphatag}/plugins/ExtendedFileManager/
+rm -rf %{name}-%{version}-%{alphatag}/unsupported_plugins/
+rm -rf %{name}-%{version}-%{alphatag}/contrib/
 
 # Remove carriage returns
-cat %{name}-%{version}-%{release}/skins/inditreuse/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/inditreuse/README
-cat %{name}-%{version}-%{release}/license.txt| tr -d "\r \n" > license.unix
-mv license.unix %{name}-%{version}-%{release}/license.txt
-cat %{name}-%{version}-%{release}/skins/titan/README | tr -d "\r \n" > README.unix
-mv README.unix %{name}-%{version}-%{release}/skins/titan/README
+cat %{name}-%{version}-%{alphatag}/skins/inditreuse/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/inditreuse/README
+cat %{name}-%{version}-%{alphatag}/license.txt| tr -d "\r \n" > license.unix
+mv license.unix %{name}-%{version}-%{alphatag}/license.txt
+cat %{name}-%{version}-%{alphatag}/skins/titan/README | tr -d "\r \n" > README.unix
+mv README.unix %{name}-%{version}-%{alphatag}/skins/titan/README
 
 
 # Organize the documentation files into folders. We can't just
@@ -72,31 +74,31 @@ mkdir doc/inditreuse-skin doc/titan-skin
 mkdir doc/InsertSmiley doc/SmartReplace doc/Equation doc/SpellChecker
 mkdir doc/SaveSubmit doc/FormOperations doc/InsertSnippet doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/license.txt doc
-mv %{name}-%{version}-%{release}/release-notes.txt doc
-mv %{name}-%{version}-%{release}/XinhaLoader_readme.txt doc
-
-mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images
-
-mv %{name}-%{version}-%{release}/iconsets/Tango/LICENSE doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Tango/README doc/tango-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/LICENSE doc/crystal-icons
-mv %{name}-%{version}-%{release}/iconsets/Crystal/README doc/crystal-icons
-
-mv %{name}-%{version}-%{release}/skins/inditreuse/README doc/inditreuse-skin
-mv %{name}-%{version}-%{release}/skins/titan/README doc/titan-skin
-
-mv %{name}-%{version}-%{release}/plugins/InsertSmiley/README.txt doc/InsertSmiley
-mv %{name}-%{version}-%{release}/plugins/SmartReplace/readme.txt doc/SmartReplace
-mv %{name}-%{version}-%{release}/plugins/Equation/readme.txt doc/Equation
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/README doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
-mv %{name}-%{version}-%{release}/plugins/SaveSubmit/README.txt doc/SaveSubmit
-mv %{name}-%{version}-%{release}/plugins/FormOperations/README doc/FormOperations
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet/readme.html doc/InsertSnippet
-mv %{name}-%{version}-%{release}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
+mv %{name}-%{version}-%{alphatag}/license.txt doc
+mv %{name}-%{version}-%{alphatag}/release-notes.txt doc
+mv %{name}-%{version}-%{alphatag}/XinhaLoader_readme.txt doc
+
+mv %{name}-%{version}-%{alphatag}/images/tango/COPYING doc/tango-images
+
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/LICENSE doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Tango/README doc/tango-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/LICENSE doc/crystal-icons
+mv %{name}-%{version}-%{alphatag}/iconsets/Crystal/README doc/crystal-icons
+
+mv %{name}-%{version}-%{alphatag}/skins/inditreuse/README doc/inditreuse-skin
+mv %{name}-%{version}-%{alphatag}/skins/titan/README doc/titan-skin
+
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSmiley/README.txt doc/InsertSmiley
+mv %{name}-%{version}-%{alphatag}/plugins/SmartReplace/readme.txt doc/SmartReplace
+mv %{name}-%{version}-%{alphatag}/plugins/Equation/readme.txt doc/Equation
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/README doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
+mv %{name}-%{version}-%{alphatag}/plugins/SaveSubmit/README.txt doc/SaveSubmit
+mv %{name}-%{version}-%{alphatag}/plugins/FormOperations/README doc/FormOperations
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet/readme.html doc/InsertSnippet
+mv %{name}-%{version}-%{alphatag}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/examples doc/examples
+mv %{name}-%{version}-%{alphatag}/examples doc/examples
 
 %build
 
@@ -109,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Create the directory (if not already there) where js is supposed to go
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/js
-cp -a %{name}-%{version}-%{release} $RPM_BUILD_ROOT%{_datadir}/js/
+cp -a %{name}-%{version}-%{alphatag} $RPM_BUILD_ROOT%{_datadir}/js/
 
 # Create conf.d, if it's not there already, and copy over our .conf file
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
@@ -135,5 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sun Dec 6 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2.1
+- Changed release tag format to add the dist tag and a build number
 * Mon Oct 19 2009 Matthew Daniels <danielsmw at gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation) 




More information about the fedora-extras-commits mailing list