Hello community,
here is the log from the commit of package kicad for openSUSE:Factory checked
in at 2013-08-16 12:42:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kicad (Old)
and /work/SRC/openSUSE:Factory/.kicad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kicad/kicad-gost.changes 2013-08-05
20:45:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kicad.new/kicad-gost.changes 2013-08-16
12:42:27.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Aug 7 20:02:42 UTC 2013 - dmitr...@opensuse.org
+
+- Removed templates to avoid conflict with kicad-library package
+ * kikad-no-templates-install.patch
+- Removed obsolete kicad-2012.01.19-build-with-old-wxwidgets.patch
+
+-------------------------------------------------------------------
+Wed Jul 17 11:59:08 UTC 2013 - dmitr...@opensuse.org
+
+- Update to version 20130707
+ * no changelog available
+ * removed obsolete kicad-2012.01.19-gcc-4.7.patch
+
+-------------------------------------------------------------------
kicad.changes: same change
Old:
----
kicad-2012.01.19-build-with-old-wxwidgets.patch
kicad-2012.01.19-gcc-4.7.patch
kicad-20130331.tar.bz2
New:
----
kicad-20130707.tar.bz2
kikad-no-templates-install.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kicad-gost.spec ++++++
--- /var/tmp/diff_new_pack.cSxlAv/_old 2013-08-16 12:42:28.000000000 +0200
+++ /var/tmp/diff_new_pack.cSxlAv/_new 2013-08-16 12:42:28.000000000 +0200
@@ -26,7 +26,7 @@
%else
Name: kicad
%endif
-Version: 20130331
+Version: 20130707
Release: 0
License: GPL-2.0+
%if 0%{?with_gost}
@@ -37,15 +37,14 @@
Group: Productivity/Scientific/Electronics
Url: http://kicad-pcb.org
# bzr branch lp:kicad/stable stable
-# bzr export -r 3261 --root=kicad-[version] kicad-[version].tar.bz
+# bzr export -r 4022 --root=kicad-[version] kicad-[version].tar.bz
Source: kicad-%{version}.tar.bz2
-Patch0: kicad-2012.01.19-gcc-4.7.patch
-Patch1: kicad-2012.01.19-build-with-old-wxwidgets.patch
-
+Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6
BuildRequires: doxygen
+BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@@ -78,12 +77,7 @@
%prep
%setup -q -n kicad-%{version}
-%if 0%{?suse_version} > 1210
-%patch0 -p1
-%endif
-%if 0%{?suse_version} <= 1110
%patch1 -p1
-%endif
# fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS
%{_lib}/kicad/plugins|' CMakeLists.txt
@@ -108,6 +102,8 @@
make install DESTDIR="%buildroot"
%suse_update_desktop_file -r kicad "Education;Engineering"
+%fdupes -s %{buildroot}%{_datadir}/kicad
+
%files
%defattr(-,root,root)
%doc COPYRIGHT.txt CHANGELOG.txt
++++++ kicad.spec ++++++
--- /var/tmp/diff_new_pack.cSxlAv/_old 2013-08-16 12:42:28.000000000 +0200
+++ /var/tmp/diff_new_pack.cSxlAv/_new 2013-08-16 12:42:28.000000000 +0200
@@ -26,7 +26,7 @@
%else
Name: kicad
%endif
-Version: 20130331
+Version: 20130707
Release: 0
License: GPL-2.0+
%if 0%{?with_gost}
@@ -37,15 +37,14 @@
Group: Productivity/Scientific/Electronics
Url: http://kicad-pcb.org
# bzr branch lp:kicad/stable stable
-# bzr export -r 3261 --root=kicad-[version] kicad-[version].tar.bz
+# bzr export -r 4022 --root=kicad-[version] kicad-[version].tar.bz
Source: kicad-%{version}.tar.bz2
-Patch0: kicad-2012.01.19-gcc-4.7.patch
-Patch1: kicad-2012.01.19-build-with-old-wxwidgets.patch
-
+Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6
BuildRequires: doxygen
+BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@@ -78,12 +77,7 @@
%prep
%setup -q -n kicad-%{version}
-%if 0%{?suse_version} > 1210
-%patch0 -p1
-%endif
-%if 0%{?suse_version} <= 1110
%patch1 -p1
-%endif
# fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS
%{_lib}/kicad/plugins|' CMakeLists.txt
@@ -108,6 +102,8 @@
make install DESTDIR="%buildroot"
%suse_update_desktop_file -r kicad "Education;Engineering"
+%fdupes -s %{buildroot}%{_datadir}/kicad
+
%files
%defattr(-,root,root)
%doc COPYRIGHT.txt CHANGELOG.txt
++++++ kicad-20130331.tar.bz2 -> kicad-20130707.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kicad/kicad-20130331.tar.bz2
/work/SRC/openSUSE:Factory/.kicad.new/kicad-20130707.tar.bz2 differ: char 11,
line 1
++++++ kikad-no-templates-install.patch ++++++
Index: kicad-20130707/template/CMakeLists.txt
===================================================================
--- kicad-20130707.orig/template/CMakeLists.txt
+++ kicad-20130707/template/CMakeLists.txt
@@ -2,17 +2,5 @@ install(FILES kicad.pro
DESTINATION ${KICAD_TEMPLATE}
COMPONENT resources)
-# template_lst is a list of all templates.
-set( template_lst
- raspberrypi-gpio
- stm32f100-discovery-shield
- ti-stellaris-boosterpack40
- ti-stellaris-boosterpack40_min
- )
-foreach( tpl ${template_lst} )
- install( DIRECTORY ${tpl}
- DESTINATION ${KICAD_TEMPLATE}
- COMPONENT templates )
-endforeach()
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
