From 8512637e7d78424e539039b3ab3a770a6365e95e Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 23:49:24 +0400 Subject: [PATCH] Automatic import for version 20111228.bzr3254 --- .abf.yml | 6 +++--- kicad.spec | 43 +++++++++++++++++++------------------------ 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/.abf.yml b/.abf.yml index 2c73a28..c330cc5 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: - "kicad-doc-bzr216.tar.bz2": 87b615fc572c5bf67b63c9325e2a342aed3776ec - "kicad-library-bzr109.tar.bz2": d29f3eb40320bc9d657fb0e208e5708237bbd8d2 - "kicad-sources-bzr3009.tar.bz2": 6b5cb26c25b94b46459be2f42f70934a6bcb7ebf + "kicad-doc-bzr303.tar.bz2": 3503587bd091f8c15f2633f168c90514f63b8a50 + "kicad-library-bzr112.tar.bz2": 58fe17f4e3bb56aa4a37b9af12ffc1c83354176e + "kicad-sources-bzr3254.tar.bz2": 7c6297c79f40f474cab55fd2fee401bb19d3178c diff --git a/kicad.spec b/kicad.spec index 3777cf9..e7bcb44 100644 --- a/kicad.spec +++ b/kicad.spec @@ -28,21 +28,21 @@ # 216: Andrey Fedorushkov 2011-06-02 update russian GUI %define name kicad -%define date 20110525 -%define revision 3009 +%define date 20111228 +%define revision 3254 %define version %{date}.bzr%{revision} %define docname kicad-doc -%define docdate 20110602 -%define docrevision 216 +%define docdate 20111221 +%define docrevision 303 %define docversion %{docdate}.bzr%{docrevision} %define libname kicad-library -%define libdate 20101208 -%define librevision 109 +%define libdate 20111126 +%define librevision 112 %define libversion %{libdate}.bzr%{librevision} -%define release %mkrel 6 +%define release %mkrel 1 Name: %{name} Summary: An open source software for the creation of electronic schematic diagrams @@ -54,8 +54,7 @@ Source2: %{libname}-bzr%{librevision}.tar.bz2 License: GPLv2+ Group: Sciences/Computer science Url: http://www.lis.inpg.fr/realise_au_lis/kicad/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: wxGTK-devel >= 2.6 +BuildRequires: wxgtku-devel BuildRequires: mesa-common-devel BuildRequires: imagemagick BuildRequires: boost-devel @@ -395,7 +394,7 @@ pushd %{name} popd %install -rm -rf %{buildroot} +%__rm -rf %{buildroot} cd ../ @@ -428,18 +427,7 @@ pushd %{name} popd %clean -rm -rf %{buildroot} - -%if %mdkversion < 200900 -%post -%{update_menus} -%endif - -%if %mdkversion < 200900 -%postun -%{clean_menus} -%endif - +%__rm -rf %{buildroot} %files %defattr(-,root,root) @@ -535,11 +523,18 @@ rm -rf %{buildroot} %changelog -* Sun Jun 05 2011 Alexandre Lissy 20110525.bzr3009-6mdv2011.0 +* Mon Jan 16 2012 Andrey Bondrov 20111228.bzr3254-1mdv2012.0 ++ Revision: 761801 +- New revisions: kicad 3254, library 112, doc 303. Build against utf8 wxGTK2.8 + +* Sun Jun 05 2011 Alexandre Lissy 20110525.bzr3009-6 + Revision: 682787 - Only one %%mkrel - Split kicad-locales into several package, each providing kicad-locales-X and kicad-locale - Adding Suggests from kicad to kicad-locale + +* Sun Jun 05 2011 Alexandre Lissy 20110525.bzr3009-5 ++ Revision: 682786 - Unifying versions number - Changing requires - Adding missing License @@ -604,7 +599,7 @@ rm -rf %{buildroot} + Pixel - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas - + Olivier Blin + + Olivier Blin - restore BuildRoot