[packages/cherrytree] Cleanup whitespace, dead code. Pldize

glen glen at pld-linux.org
Fri Jan 22 10:00:45 CET 2021


commit aa4b1484d8e2cc251a26775a3255acf078bbec3e
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Jan 22 11:00:11 2021 +0200

    Cleanup whitespace, dead code. Pldize

 cherrytree.spec | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/cherrytree.spec b/cherrytree.spec
index ae19e33..7377671 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -5,9 +5,9 @@ Version:	0.99.29
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://www.giuspen.com/software/%{name}_%{version}.tar.xz
+Source0:	https://www.giuspen.com/software/%{name}_%{version}.tar.xz
 # Source0-md5:	e8dd108f5a8aa81315f600c4e656265d
-URL:		http://www.giuspen.com/cherrytree
+URL:		https://www.giuspen.com/cherrytree/
 BuildRequires:	curl-devel
 BuildRequires:	gspell-devel
 BuildRequires:	gtkmm3-devel
@@ -18,18 +18,15 @@ BuildRequires:	rpmbuild(macros) >= 1.596
 BuildRequires:	shared-mime-info
 BuildRequires:	spdlog-devel >= 1:1.8.1
 BuildRequires:	uchardet-devel
-
 Requires:	gspell
 Requires:	gtksourceviewmm3
 Requires:	libfmt
 Requires:	libxml++2
 Requires:	shared-mime-info
 Requires:	spdlog >= 1:1.8.1
-
 Suggests:	p7zip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 A hierarchical note taking application, featuring rich text and syntax
 highlighting, storing all the data (including images) in a single xml
@@ -42,10 +39,9 @@ jednym pliku XML z rozszerzeniem „.ctd”.
 
 %prep
 %setup -q -n %{name}_%{version}
-#sed -i -e 's/#!\/usr\/bin\/env\ python2/#!\/usr\/bin\/python2/' glade/svg_to_png.py
 
 %build
-mkdir -p build
+install -d build
 cd build
 %cmake .. \
 	-DMAKE_BUILD_TYPE=Release \
@@ -55,11 +51,8 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-cd build
-%{__make} install \
-        DESTDIR=$RPM_BUILD_ROOT
-cd ..
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 ## Remove old mime registration files
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/mime-info/cherrytree.*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cherrytree.git/commitdiff/aa4b1484d8e2cc251a26775a3255acf078bbec3e



More information about the pld-cvs-commit mailing list