dist-git conversion

- CVE-2010-1916 xinha: access restriction bypass [MOPS 2010-020]

.cvsignore

@@ -1 +0,0 @@
-xinha-0.96-0.1.b2.tar.gz

.gitignore

@@ -0,0 +1 @@
+Xinha-0.96.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xinha
-# $Id$
-NAME := xinha
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1,2 +0,0 @@
-xinha-0_96-0_1_b2:HEAD:xinha-0.96-0.1.b2.src.rpm:1257274699
-xinha-0_96-0_1_b2:HEAD:xinha-0.96-0.1.b2.src.rpm:1259799140

sources

@@ -1 +1 @@
-6a7202c9fe279beae3f6b0945535ea56  xinha-0.96-0.1.b2.tar.gz
+2266646966485c98f40b43477a2d7b62  Xinha-0.96.1.tar.bz2

xinha.spec

@@ -1,19 +1,13 @@
 Name:		xinha
-Version:	0.96
-Release:	0.1.b2
+Version:	0.96.1
+Release:	2%{?dist}
 Summary:	A WYSIWIG HTML editor component in Javascript
 
 Group:		Development/Languages
 License:	BSD and PHP and LGPLv2+ and CC-BY-SA
 URL:		http://www.xinha.org
 
-# The source for this package was pulled from upstream's vcs.  Use the
-# following commands to generate the tarball (and add my conf file):
-#
-#  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/Xinha-%{version}.tar.bz2
 Source1:	xinha.conf
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -34,33 +28,35 @@ HTML. It can be used on its own or as part of a larger WYSIWYG module such as
 Scribite.
 
 %prep
-%setup -q -c -n %{name}-%{version}-%{release} -a 0
+%setup -q -c tmp/Xinha-%{version}
+mv tmp/Xinha-%{version} Xinha-%{version}
+rm -rf tmp
 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 Xinha-%{version} | grep \.jar$ | xargs rm
+find Xinha-%{version} | 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 Xinha-%{version} | grep \.js$ | xargs chmod a-x
+find Xinha-%{version} | grep \.php$ | xargs chmod a-x
+find Xinha-%{version} | grep \.css$ | xargs chmod a-x
+find Xinha-%{version} | grep \.html$ | xargs chmod a-x
+find Xinha-%{version} | 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 Xinha-%{version}/plugins/ImageManager/
+rm -rf Xinha-%{version}/plugins/ExtendedFileManager/
+rm -rf Xinha-%{version}/unsupported_plugins/
+rm -rf Xinha-%{version}/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 Xinha-%{version}/skins/inditreuse/README | tr -d "\r \n" > README.unix
+mv README.unix Xinha-%{version}/skins/inditreuse/README
+cat Xinha-%{version}/license.txt| tr -d "\r \n" > license.unix
+mv license.unix Xinha-%{version}/license.txt
+cat Xinha-%{version}/skins/titan/README | tr -d "\r \n" > README.unix
+mv README.unix Xinha-%{version}/skins/titan/README
 
 
 # Organize the documentation files into folders. We can't just
@@ -72,31 +68,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 Xinha-%{version}/license.txt doc
+mv Xinha-%{version}/release-notes.txt doc
+mv Xinha-%{version}/XinhaLoader_readme.txt doc
 
-mv %{name}-%{version}-%{release}/images/tango/COPYING doc/tango-images
+mv Xinha-%{version}/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 Xinha-%{version}/iconsets/Tango/LICENSE doc/tango-icons
+mv Xinha-%{version}/iconsets/Tango/README doc/tango-icons
+mv Xinha-%{version}/iconsets/Crystal/LICENSE doc/crystal-icons
+mv Xinha-%{version}/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 Xinha-%{version}/skins/inditreuse/README doc/inditreuse-skin
+mv Xinha-%{version}/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 Xinha-%{version}/plugins/InsertSmiley/README.txt doc/InsertSmiley
+mv Xinha-%{version}/plugins/SmartReplace/readme.txt doc/SmartReplace
+mv Xinha-%{version}/plugins/Equation/readme.txt doc/Equation
+mv Xinha-%{version}/plugins/SpellChecker/README doc/SpellChecker
+mv Xinha-%{version}/plugins/SpellChecker/readme-tech.html doc/SpellChecker
+mv Xinha-%{version}/plugins/SaveSubmit/README.txt doc/SaveSubmit
+mv Xinha-%{version}/plugins/FormOperations/README doc/FormOperations
+mv Xinha-%{version}/plugins/InsertSnippet/readme.html doc/InsertSnippet
+mv Xinha-%{version}/plugins/InsertSnippet2/readme.html doc/InsertSnippet2
 
-mv %{name}-%{version}-%{release}/examples doc/examples
+mv Xinha-%{version}/examples doc/examples
 
 %build
 
@@ -108,8 +104,8 @@ mv %{name}-%{version}-%{release}/examples doc/examples
 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/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/js/%{name}-%{version}
+cp -p -r -a Xinha-%{version}/* $RPM_BUILD_ROOT%{_datadir}/js/%{name}-%{version}
 
 # Create conf.d, if it's not there already, and copy over our .conf file
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
@@ -120,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/js/%{name}-%{version}-%{release}
+%{_datadir}/js/%{name}-%{version}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
 
 # Install documentation
@@ -135,5 +131,12 @@ rm -rf $RPM_BUILD_ROOT
 # a better protocol for doing so.
 
 %changelog
+* Sat May 29 2010 Rakesh Pandit <rakesh@fedoraproject.org> - 0.96.1-2
+- Bumped to fix missing dist tag
+
+* Sat May 29 2010 Rakesh Pandit <rakesh@fedoraproject.org> - 0.96.1-1
+- Updated to 0.96.1
+- CVE-2010-1916 xinha: access restriction bypass [MOPS 2010-020]
+
 * Mon Oct 19 2009 Matthew Daniels <danielsmw@gmail.com> - 0.96-0.1.b2
 - Spec file submission (initial package creation)