From 1e0aaeec919482b550de87be84cfc9806edbca88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 18 Sep 2013 19:29:31 +0200 Subject: [PATCH] do not use *.spec.in template use *.spec file with RPM macros instead - 3.0.1 --- _cvsignore => .gitignore | 3 +- VERSION | 2 +- package/.gitignore | 1 + package/_cvsignore | 2 -- package/yast2-isns.changes | 7 +++++ package/yast2-isns.spec | 61 ++++++++++++++++++++++++++++++++++++++ yast2-isns.spec.in | 34 --------------------- 7 files changed, 72 insertions(+), 38 deletions(-) rename _cvsignore => .gitignore (92%) create mode 100644 package/.gitignore delete mode 100644 package/_cvsignore create mode 100644 package/yast2-isns.spec delete mode 100644 yast2-isns.spec.in diff --git a/_cvsignore b/.gitignore similarity index 92% rename from _cvsignore rename to .gitignore index 419aba8..d4166ef 100644 --- a/_cvsignore +++ b/.gitignore @@ -10,7 +10,7 @@ config.log config.status config.sub configure -configure.in +configure.ac depcomp install-sh missing @@ -18,3 +18,4 @@ mkinstalldirs stamp-h isns.pot autom4te.cache +*.ami diff --git a/VERSION b/VERSION index 4a36342..cb2b00e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0 +3.0.1 diff --git a/package/.gitignore b/package/.gitignore new file mode 100644 index 0000000..192fb09 --- /dev/null +++ b/package/.gitignore @@ -0,0 +1 @@ +*.bz2 diff --git a/package/_cvsignore b/package/_cvsignore deleted file mode 100644 index 65d0b1a..0000000 --- a/package/_cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -*.spec -*.bz2 diff --git a/package/yast2-isns.changes b/package/yast2-isns.changes index 6502391..5536beb 100644 --- a/package/yast2-isns.changes +++ b/package/yast2-isns.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 18 17:28:24 UTC 2013 - lslezak@suse.cz + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.0.1 + ------------------------------------------------------------------- Wed Jul 31 08:31:38 UTC 2013 - yast-devel@opensuse.org diff --git a/package/yast2-isns.spec b/package/yast2-isns.spec new file mode 100644 index 0000000..25ae20d --- /dev/null +++ b/package/yast2-isns.spec @@ -0,0 +1,61 @@ +# +# spec file for package yast2-isns +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: yast2-isns +Version: 3.0.1 +Release: 0 +License: GPL-2.0 +Group: System/YaST + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{name}-%{version}.tar.bz2 + +# Wizard::SetDesktopTitleAndIcon +Requires: yast2 >= 2.21.22 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite +BuildRequires: yast2-devtools >= 3.0.6 + +BuildArchitectures: noarch + +Requires: yast2-ruby-bindings >= 1.0.0 + +Summary: Configuration of isns + +%description +- + +%prep +%setup -n %{name}-%{version} + +%build +%yast_build + +%install +%yast_install + + +%files +%defattr(-,root,root) +%dir %{yast_yncludedir}/isns +%{yast_yncludedir}/isns/* +%{yast_clientdir}/isns.rb +%{yast_clientdir}/isns_*.rb +%{yast_moduledir}/*.rb +%{yast_desktopdir}/isns.desktop +%{yast_scrconfdir}/*.scr +%doc %{yast_docdir} diff --git a/yast2-isns.spec.in b/yast2-isns.spec.in deleted file mode 100644 index 046b103..0000000 --- a/yast2-isns.spec.in +++ /dev/null @@ -1,34 +0,0 @@ -@HEADER-COMMENT@ - -@HEADER@ -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite - -BuildArchitectures: noarch - -Requires: yast2-ruby-bindings >= 1.0.0 - -Summary: Configuration of isns - -%description -- - -@PREP@ - -@BUILD@ - -@INSTALL@ - -@CLEAN@ - -%files -%defattr(-,root,root) -%dir @yncludedir@/isns -@yncludedir@/isns/* -@clientdir@/isns.rb -@clientdir@/isns_*.rb -@moduledir@/*.rb -@desktopdir@/isns.desktop -@scrconfdir@/*.scr -%doc @docdir@