[transifex/el6] Update to new upstream version.

Domingo Becker beckerde at fedoraproject.org
Mon Sep 5 22:04:09 UTC 2011


commit fe2f17c1944e67a997946ec2695a20e1bd04e846
Author: Domingo Becker <domingobecker at gmail.com>
Date:   Mon Sep 5 19:03:47 2011 -0300

    Update to new upstream version.

 .gitignore     |    1 +
 sources        |    2 +-
 transifex.spec |  271 ++++++++++++++++++++++++++++----------------------------
 3 files changed, 136 insertions(+), 138 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e71374e..d31041e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 transifex-0.6.tar.gz
 /transifex-0.9.1.tar.gz
+/transifex-1.1.0beta.tar.gz
diff --git a/sources b/sources
index 09f8f16..4bdffb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5864502a0b4a014e3938e40785be370b  transifex-0.9.1.tar.gz
+782f95f01eb55b59de154c2e7d76b21d  transifex-1.1.0beta.tar.gz
diff --git a/transifex.spec b/transifex.spec
index 80ce1a0..596226f 100644
--- a/transifex.spec
+++ b/transifex.spec
@@ -1,20 +1,21 @@
-%define confdir %{_sysconfdir}/%{name}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%define confdir %{python_sitelib}/%{name}/settings
+#% define confdir %{_sysconfdir}/%{name}
 
 Name:       transifex
-Version:    0.9.1
-Release:    1%{?dist}
+Version:    1.1.0
+Release:    3%{?dist}
 Summary:    A system for distributed translation submissions
 
 Group:      Applications/Internet
 License:    GPLv2
 URL:        http://pypi.python.org/pypi/transifex
-Source0:    http://pypi.python.org/packages/source/t/transifex/%{name}-%{version}.tar.gz
+Source0:    http://pypi.python.org/packages/source/t/transifex/%{name}-%{version}beta.tar.gz
 Source1:    django-settings.py.in
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 BuildRequires:  python-sphinx gettext python-markdown
-
 BuildRequires:  Django django-contact-form django-pagination django-tagging
 BuildRequires:  django-notification django-profile Django-south django-piston
 BuildRequires:  django-authority mercurial >= 1.3
@@ -24,79 +25,70 @@ BuildRequires: python-sqlite2
 
 Requires:   mercurial >= 1.3 python-urlgrabber intltool >= 0.37.1
 Requires:   python-markdown python-pygments python-polib >= 0.4.2
-
 Requires:   Django django-contact-form django-pagination django-tagging
 Requires:   django-notification django-profile Django-south >= 0.7.3 django-piston
 Requires:   django-authority django-filter django-sorting
 Requires:   django-ajax-selects django-threadedcomments django-staticfiles django-addons
-Requires:   python-pygooglechart python-sqlite2
+Requires:   python-sqlite2
 
 %description
 Transifex is a web-system that facilitates the process of submitting
 translations in remote and disparate version control systems (VCS).
 
-%package extras
-Summary:    Additional support for Transifex
-Group:      Applications/Internet
-Requires:   transifex = %{version}
-Requires:   cvs pysvn bzrtools git
-
-%description extras
-This package adds extra options to Transifex.
-
-  * cvs support
-  * svn support
-  * bzr support
-  * git support
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}beta
 sed -e 's!share/locale!.*/locale!' /usr/lib/rpm/find-lang.sh > my-find-lang.sh
 
 %build
-cd transifex
-rm -rf .hg* build-tools
-rm -r vcs/tests
+%{__python} setup.py build
+#cd transifex
+#rm -rf .hg* build-tools
+#rm -r vcs/tests
 #python manage.py syncdb --noinput    # Setup DB tables
 #python manage.py migrate             # Setup more DB tables
 #python manage.py txcreatelanguages   # Create a standard set of languages
-python manage.py txcompilemessages   # Create message catalogs for i18n
+#python manage.py txcompilemessages   # Create message catalogs for i18n
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd transifex
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-find -mindepth 1 -maxdepth 1 -type d \( \( -name .hg -o \
-    -name build-tools -o -name docs -o -name settings \) -prune -o \
-    -print \) | xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
-cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-find $RPM_BUILD_ROOT%{_datadir}/%{name}/locale -name \*.po -exec rm {} +
-
-for vcs in cvs svn bzr hg git tar
-do
-    mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/scratchdir/sources/"$vcs"
-done
+#transifex now installs as a normal django application
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+#The next part of the install process is removed 
+#cd transifex
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+#find -mindepth 1 -maxdepth 1 -type d \( \( -name .hg -o \
+#    -name build-tools -o -name docs -o -name settings \) -prune -o \
+#    -print \) | xargs cp -a -t $RPM_BUILD_ROOT/%{_datadir}/%{name}
+#cp -a *.py $RPM_BUILD_ROOT%{_datadir}/%{name}
+#find $RPM_BUILD_ROOT%{_datadir}/%{name}/locale -name \*.po -exec rm {} +
+
+#for vcs in cvs svn bzr hg git tar
+#do
+#    mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/scratchdir/sources/"$vcs"
+#done
 
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
-install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
+#install -d -m 0755 $RPM_BUILD_ROOT/%{confdir}
 
-cp -a settings/*.conf $RPM_BUILD_ROOT/%{confdir}
+#cp -a settings/*.conf $RPM_BUILD_ROOT/%{confdir}
 
 sed -i -e 's!^\(LOG_PATH = \).*$!\1"%{_localstatedir}/log/%{name}"!' \
     $RPM_BUILD_ROOT/%{confdir}/10-base.conf
 
-sed -e 's!\[\[confpath\]\]!%{confdir}!' %{SOURCE1} > \
-    $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py
+#sed -e 's!\[\[confpath\]\]!%{confdir}!' %{SOURCE1} > \
+#    $RPM_BUILD_ROOT%{_datadir}/%{name}/settings.py
 
-cd ..
+#cd ..
 
-sh my-find-lang.sh $RPM_BUILD_ROOT django transifex.lst
+#sh my-find-lang.sh $RPM_BUILD_ROOT django transifex.lst
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+ln -s %{python_sitelib}/%{name}/settings %{_sysconfdir}/%{name} 
 # Check to see if the secret key for Django needs setting, and then set it
 if grep -q '\[\[SECRETKEY\]\]' %{confdir}/10-base.conf
 then
@@ -110,102 +102,107 @@ EOF
         %{confdir}/10-base.conf
 fi
 
-%files -f transifex.lst
-%defattr(-,root,root,-)
-%doc LICENSE README docs/html
-%dir %{confdir}
-%config(noreplace) %{confdir}/10-base.conf
-%config(noreplace) %{confdir}/20-engines.conf
-%config(noreplace) %{confdir}/30-site.conf
-%config(noreplace) %{confdir}/40-apps.conf
-%config(noreplace) %{confdir}/50-project.conf
-%config(noreplace) %{confdir}/60-vcs.conf
-%config(noreplace) %{confdir}/65-tarball.conf
-%config(noreplace) %{confdir}/70-translation.conf
-%config(noreplace) %{confdir}/89-addons.conf
-%config(noreplace) %{confdir}/95-methods.conf
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/__init__.py
-%{_datadir}/%{name}/__init__.py[co]
-%{_datadir}/%{name}/manage.py
-%{_datadir}/%{name}/manage.py[co]
-%{_datadir}/%{name}/settings.py
-%{_datadir}/%{name}/settings.py[co]
-%{_datadir}/%{name}/urls.py
-%{_datadir}/%{name}/urls.py[co]
-%{_datadir}/%{name}/actionlog
-%{_datadir}/%{name}/codebases
-%{_datadir}/%{name}/external
-%{_datadir}/%{name}/languages
-%dir %{_datadir}/%{name}/locale
-%{_datadir}/%{name}/locale/LINGUAS
-%{_datadir}/%{name}/projects
-%{_datadir}/%{name}/releases
-%{_datadir}/%{name}/simpleauth
-%{_datadir}/%{name}/site_media
-%{_datadir}/%{name}/submissions
-%{_datadir}/%{name}/tarball
-%{_datadir}/%{name}/templates
-%{_datadir}/%{name}/txcommon
-%{_datadir}/%{name}/translations
-%{_datadir}/%{name}/txpermissions
-%dir %{_datadir}/%{name}/reviews
-%{_datadir}/%{name}/reviews/*.py
-%{_datadir}/%{name}/reviews/*.py[co]
-%{_datadir}/%{name}/reviews/migrations
-%dir %{_datadir}/%{name}/teams
-%{_datadir}/%{name}/teams/*.py
-%{_datadir}/%{name}/teams/*.py[co]
-%{_datadir}/%{name}/teams/migrations
-%{_datadir}/%{name}/teams/templatetags
-%dir %{_datadir}/%{name}/vcs
-%{_datadir}/%{name}/vcs/*.py
-%{_datadir}/%{name}/vcs/*.py[co]
-%dir %{_datadir}/%{name}/vcs/lib
-%{_datadir}/%{name}/vcs/lib/*.py
-%{_datadir}/%{name}/vcs/lib/*.py[co]
-%dir %{_datadir}/%{name}/vcs/migrations
-%{_datadir}/%{name}/vcs/migrations/*.py
-%{_datadir}/%{name}/vcs/migrations/*.py[co]
-%dir %{_datadir}/%{name}/vcs/lib/support
-%{_datadir}/%{name}/vcs/lib/support/__init__.py
-%{_datadir}/%{name}/vcs/lib/support/hg.py
-%{_datadir}/%{name}/vcs/lib/support/*.py[co]
-%dir %{_datadir}/%{name}/vcs/lib/types
-%{_datadir}/%{name}/vcs/lib/types/__init__.py
-%{_datadir}/%{name}/vcs/lib/types/dummy.py
-%{_datadir}/%{name}/vcs/lib/types/hg.py
-%{_datadir}/%{name}/vcs/lib/types/*py[co]
-%{_datadir}/%{name}/vcs/lib/exceptions/__init__.py
-%{_datadir}/%{name}/vcs/lib/exceptions/__init__.py[co]
-%{_datadir}/%{name}/webtrans
-%dir %{_localstatedir}/lib/%{name}
-%dir %{_localstatedir}/lib/%{name}/scratchdir
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/hg
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/tar
-%{_datadir}/%{name}/addons
-%{_datadir}/%{name}/media
-%{_datadir}/%{name}/txcollections
-%{_datadir}/%{name}/views.py
-%{_datadir}/%{name}/views.py[co]
-
-%files extras
+%postun
+rm -f %{_sysconfdir}/%{name}
+
+
+#%files -f transifex.lst
+%files
 %defattr(-,root,root,-)
-%doc LICENSE README
-%config(noreplace) %{confdir}/80-vcs-extras.conf
-%{_datadir}/%{name}/vcs/lib/support/cvs.py
-%{_datadir}/%{name}/vcs/lib/types/cvs.py
-%{_datadir}/%{name}/vcs/lib/types/svn.py
-%{_datadir}/%{name}/vcs/lib/types/bzr.py
-%{_datadir}/%{name}/vcs/lib/support/git.py
-%{_datadir}/%{name}/vcs/lib/types/git.py
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/cvs
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/svn
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/bzr
-%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/git
+#%doc LICENSE README docs/html
+%{python_sitelib}/
+%exclude %{_prefix}/templates/
+#%config(noreplace) %{confdir}/10-base.conf
+#%config(noreplace) %{confdir}/20-engines.conf
+#%config(noreplace) %{confdir}/30-site.conf
+#%config(noreplace) %{confdir}/40-apps.conf
+#%config(noreplace) %{confdir}/50-project.conf
+#%config(noreplace) %{confdir}/55-haystack.conf
+#%config(noreplace) %{confdir}/60-vcs.conf
+#%config(noreplace) %{confdir}/65-tarball.conf
+#%config(noreplace) %{confdir}/70-translation.conf
+#%config(noreplace) %{confdir}/80-storage.conf
+#%config(noreplace) %{confdir}/89-addons.conf
+#%config(noreplace) %{confdir}/90-local.conf.sample
+#%config(noreplace) %{confdir}/95-methods.conf
+
+#%dir %{_datadir}/%{name}
+#%{_datadir}/%{name}/__init__.py
+#%{_datadir}/%{name}/__init__.py[co]
+#%{_datadir}/%{name}/manage.py
+#%{_datadir}/%{name}/manage.py[co]
+#%{_datadir}/%{name}/settings.py
+#%{_datadir}/%{name}/settings.py[co]
+#%{_datadir}/%{name}/urls.py
+#%{_datadir}/%{name}/urls.py[co]
+#%{_datadir}/%{name}/actionlog
+#%{_datadir}/%{name}/codebases
+#%{_datadir}/%{name}/external
+#%{_datadir}/%{name}/languages
+#%dir %{_datadir}/%{name}/locale
+#%{_datadir}/%{name}/locale/LINGUAS
+#%{_datadir}/%{name}/projects
+#%{_datadir}/%{name}/releases
+#%{_datadir}/%{name}/simpleauth
+#%{_datadir}/%{name}/site_media
+#%{_datadir}/%{name}/submissions
+#%{_datadir}/%{name}/tarball
+#%{_datadir}/%{name}/templates
+#%{_datadir}/%{name}/txcommon
+#%{_datadir}/%{name}/translations
+#%{_datadir}/%{name}/txpermissions
+#%dir %{_datadir}/%{name}/reviews
+#%{_datadir}/%{name}/reviews/*.py
+#%{_datadir}/%{name}/reviews/*.py[co]
+#%{_datadir}/%{name}/reviews/migrations
+#%dir %{_datadir}/%{name}/teams
+#%{_datadir}/%{name}/teams/*.py
+#%{_datadir}/%{name}/teams/*.py[co]
+#%{_datadir}/%{name}/teams/migrations
+#%{_datadir}/%{name}/teams/templatetags
+#%dir %{_datadir}/%{name}/vcs
+#%{_datadir}/%{name}/vcs/*.py
+#%{_datadir}/%{name}/vcs/*.py[co]
+#%dir %{_datadir}/%{name}/vcs/lib
+#%{_datadir}/%{name}/vcs/lib/*.py
+#%{_datadir}/%{name}/vcs/lib/*.py[co]
+#%dir %{_datadir}/%{name}/vcs/migrations
+#%{_datadir}/%{name}/vcs/migrations/*.py
+#%{_datadir}/%{name}/vcs/migrations/*.py[co]
+#%dir %{_datadir}/%{name}/vcs/lib/support
+#%{_datadir}/%{name}/vcs/lib/support/__init__.py
+#%{_datadir}/%{name}/vcs/lib/support/hg.py
+#%{_datadir}/%{name}/vcs/lib/support/*.py[co]
+#%dir %{_datadir}/%{name}/vcs/lib/types
+#%{_datadir}/%{name}/vcs/lib/types/__init__.py
+#%{_datadir}/%{name}/vcs/lib/types/dummy.py
+#%{_datadir}/%{name}/vcs/lib/types/hg.py
+#%{_datadir}/%{name}/vcs/lib/types/*py[co]
+#%{_datadir}/%{name}/vcs/lib/exceptions/__init__.py
+#%{_datadir}/%{name}/vcs/lib/exceptions/__init__.py[co]
+#%{_datadir}/%{name}/webtrans
+#%dir %{_localstatedir}/lib/%{name}
+#%dir %{_localstatedir}/lib/%{name}/scratchdir
+#%dir %{_localstatedir}/lib/%{name}/scratchdir/sources
+#%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/hg
+#%dir %{_localstatedir}/lib/%{name}/scratchdir/sources/tar
+#%{_datadir}/%{name}/addons
+#%{_datadir}/%{name}/media
+#%{_datadir}/%{name}/txcollections
+#%{_datadir}/%{name}/views.py
+#%{_datadir}/%{name}/views.py[co]
+
 
 %changelog
+* Mon Sep 05 2011 Domingo Becker <domingobecker at gmail.com> - 1.1.0-3
+- Install as a normal Django application.
+
+* Tue Aug 30 2011 Domingo Becker <domingobecker at gmail.com> - 1.1.0-2
+- Removed extra packages because it's not needed anymore.
+
+* Fri Jun 24 2011 Domingo Becker <domingobecker at gmail.com> - 1.1.0-1
+- Update to new upstream version.
+
 * Mon Dec 27 2010 usuario - 0.9.1-1
 - Update to new upstream version.
 - The previous tarball has not the media/cs and media/images directories.


More information about the scm-commits mailing list