leigh123linux pushed to nemo-extensions (f20). "use new license macro"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Jun 2 16:21:02 UTC 2015


From 91e4a4492f6ba02cbcce6d5ee1418456da2949c9 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Tue, 2 Jun 2015 12:05:08 +0100
Subject: use new license macro


diff --git a/nemo-extensions.spec b/nemo-extensions.spec
index 7a46cb7..6a1c250 100644
--- a/nemo-extensions.spec
+++ b/nemo-extensions.spec
@@ -146,11 +146,7 @@ pushd nemo-python
 rm missing
 mv configure.in configure.ac
 NOCONFIGURE=1 ./autogen.sh
-%if 0%{?fedora} < 20
-%configure --docdir=%{_datadir}/doc/nemo-python-%{version}
-%else
-%configure --docdir=%{_datadir}/doc/nemo-python
-%endif
+%configure
 make V=1 %{?_smp_mflags}
 popd
 
@@ -239,7 +235,8 @@ fi
 
 
 %files -n nemo-pastebin
-%doc nemo-pastebin/{README,NEWS,COPYING}
+%doc nemo-pastebin/{README,NEWS}
+%license nemo-pastebin/COPYING
 %{_bindir}/nemo-pastebin-configurator
 %{_datadir}/nemo-python/extensions/nemo-pastebin.py
 %{python_sitelib}/nemo_pastebin-1.0.0-py?.?.egg-info
@@ -249,15 +246,18 @@ fi
 %{_datadir}/pixmaps/nemo-pastebin.svg
 
 %files -n nemo-rabbitvcs
-%doc nemo-rabbitvcs/COPYING
+%doc nemo-rabbitvcs/README
+%license nemo-rabbitvcs/COPYING
 %{_datadir}/nemo-python/extensions/RabbitVCS.py
 
 %files -n nemo-fileroller
-%doc nemo-fileroller/COPYING
+%doc nemo-fileroller/README
+%license nemo-fileroller/COPYING
 %{_libdir}/nemo/extensions-3.0/libnemo-fileroller.so
 
 %files -n nemo-python
-%doc nemo-fileroller/COPYING
+%doc nemo-python/README
+%license nemo-python/COPYING
 %{_libdir}/nemo/extensions-3.0/libnemo-python.so
 %{_datadir}/nemo-python/
 %exclude %{_datadir}/nemo-python/extensions/*
@@ -266,13 +266,15 @@ fi
 %{_libdir}/pkgconfig/nemo-python.pc
 
 %files -n nemo-terminal
-%doc nemo-terminal/COPYING
+%doc nemo-terminal/README
+%license nemo-terminal/COPYING
 %{_datadir}/nemo-python/extensions/nemo_terminal.py
 %{_datadir}/nemo-terminal/
 %{_datadir}/glib-2.0/schemas/org.nemo.extensions.nemo-terminal.gschema.xml
 
 %files -n nemo-preview -f nemo-preview.lang
-%doc nemo-preview/{README,COPYING}
+%doc nemo-preview/README
+%license nemo-preview/COPYING
 %{_bindir}/nemo-preview
 %{_libdir}/nemo-preview/
 %{_libexecdir}/nemo-preview-start
@@ -280,11 +282,12 @@ fi
 %{_datadir}/dbus-1/services/org.nemo.Preview.service
 
 %files -n nemo-emblems
-%doc nemo-emblems/COPYING.GPL3
+%license nemo-emblems/COPYING.GPL3
 %{_datadir}/nemo-python/extensions/nemo-emblems.py
 
 %files -n nemo-image-converter  -f nemo-image-converter.lang
-%doc nemo-image-converter/COPYING
+%doc nemo-image-converter/README
+%license nemo-image-converter/COPYING
 %{_libdir}/nemo/extensions-3.0/libnemo-image-converter.so
 %{_datadir}/nemo-image-converter/
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nemo-extensions.git/commit/?h=f20&id=91e4a4492f6ba02cbcce6d5ee1418456da2949c9


More information about the scm-commits mailing list