diff --git a/.gitignore b/.gitignore index 631f62b..5737844 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *spec~ qelectrotech-0.22-src.tar.gz /qelectrotech-0.3a-src.tar.gz +/qelectrotech-0.3a-svn1844.tgz diff --git a/qelectrotech.spec b/qelectrotech.spec index 453f8c9..76b45ea 100644 --- a/qelectrotech.spec +++ b/qelectrotech.spec @@ -1,3 +1,5 @@ +%global svnrel 1844 + Name: qelectrotech Summary: An electric diagrams editor @@ -14,7 +16,7 @@ Summary(ru): Редактор электрических схем # So use %.2f with upstream acknowledgment # Remember to check Source0 + setup on each update Version: 0.30 -Release: 0.2.alpha%{?dist} +Release: 0.3.svn%{svnrel}%{?dist} Group: Applications/Engineering @@ -22,7 +24,13 @@ Group: Applications/Engineering License: GPLv2+ Url: http://qelectrotech.org/ +%if 0%{?svnrel} +# svn export -r 1844 svn://svn.tuxfamily.org/svnroot/qet/qet/trunk qelectrotech-0.3a-svn1844 +# tar czf qelectrotech-0.3a-svn1844.tgz qelectrotech-0.3a-svn1844 +Source0: qelectrotech-0.3a-svn1844.tgz +%else Source0: http://download.tuxfamily.org/qet/tags/20120513/qelectrotech-0.3a-src.tar.gz +%endif BuildRequires: desktop-file-utils Requires(post): desktop-file-utils @@ -79,6 +87,8 @@ Summary(es): Collección de elementos para QElectroTech Summary(fr): Collection d'éléments pour QElectroTech Summary(pt): Colecção de elementos para QElectroTech Summary(ru): Коллекция элементов для QElectroTech +Summary(cs): Sbírka prvků pro QElectroTech +Summary(pl): Kolekcja elementów QElectroTech Group: Applications/Productivity License: CC-BY BuildArch: noarch @@ -100,9 +110,19 @@ Colecção de elementos para QElectroTech. %description -l ru symbols Коллекция элементов для QElectroTech. +%description -l cs symbols +Sbírka prvků pro QElectroTech. + +%description -l pl symbols +Kolekcja elementów QElectroTech + %prep +%if 0%{?svnrel} +%setup -q -n %{name}-0.3a-svn%{svnrel} +%else %setup -q -n %{name}-0.3a-src +%endif sed -e s,/usr/local/,%{_prefix}/, \ -e /QET_MAN_PATH/s,'man/','share/man', \ @@ -121,24 +141,18 @@ rm -f *.lang INSTALL_ROOT=%{buildroot} make install # We only provides UTF-8 files -rm -rf %{buildroot}/usr/doc/qelectrotech \ +rm -rf %{buildroot}/usr/doc/%{name} \ + %{buildroot}%{_datadir}/%{name}/examples \ %{buildroot}%{_mandir}/fr.ISO8859-1 \ %{buildroot}%{_mandir}/fr mv %{buildroot}%{_mandir}/fr.UTF-8 %{buildroot}%{_mandir}/fr desktop-file-install --vendor="" \ - --remove-category=Office \ --add-category=Electronics \ - --add-category=Graphics \ --dir=%{buildroot}%{_datadir}/applications/ \ %{buildroot}%{_datadir}/applications/%{name}.desktop -# Fix rights -find %{buildroot}%{_datadir}/%{name}/elements \ - -type f -name '*.elmt' \ - -exec chmod -x {} \; - # QT translation provided by QT. rm -f %{buildroot}%{_datadir}/%{name}/lang/qt_*.qm @@ -165,7 +179,6 @@ fi %files -f %{name}.lang -%defattr(-,root,root,-) %doc CREDIT LICENSE examples %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop @@ -175,17 +188,22 @@ fi %{_datadir}/icons/hicolor/*/*/*.png %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/lang -%exclude %{_datadir}/%{name}/examples %{_mandir}/man1/%{name}.* %files symbols -%defattr(-,root,root,-) %doc ELEMENTS.LICENSE %{_datadir}/%{name}/elements +%{_datadir}/%{name}/titleblocks %changelog +* Tue May 15 2012 Remi Collet - 0.30-0.3.svn1844 +- pull latest change (packaging request) from SVN +- preserve timestamps on elements collection +- add missing titleblocks +- add cs + pl summary and description + * Sun May 13 2012 Remi Collet - 0.30-0.2.alpha - modernize scriptlets diff --git a/sources b/sources index 2fac421..d4f1c87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e39b252db62120d7bf9d52422819de69 qelectrotech-0.3a-src.tar.gz +0d215197ca20edfb1cd7d4033a1264a3 qelectrotech-0.3a-svn1844.tgz