[cups: 3/3] 2.0.0

[Jiří Popelka]

commit a8ab7d63bf7890a513d18e2021a43a7236dd409d
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Oct 1 19:19:50 2014 +0200

    2.0.0

 .gitignore                    |    1 +
 cups-1.7.5-source.tar.bz2.sig |  Bin 543 -> 0 bytes
 cups-2.0.0-source.tar.bz2.sig |  Bin 0 -> 543 bytes
 cups.spec                     |   20 +++++++++++---------
 sources                       |    2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2685811..0ceb184 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ cups-1.4.4-source.tar.bz2
 /cups-1.7.4-source.tar.bz2
 /cups-1.7.5-source.tar.bz2
 /cups-2.0rc1-source.tar.bz2
+/cups-2.0.0-source.tar.bz2
diff --git a/cups-2.0.0-source.tar.bz2.sig b/cups-2.0.0-source.tar.bz2.sig
new file mode 100644
index 0000000..859699e
Binary files /dev/null and b/cups-2.0.0-source.tar.bz2.sig differ
diff --git a/cups.spec b/cups.spec
index a9c6f61..12f7270 100644
--- a/cups.spec
+++ b/cups.spec
@@ -7,19 +7,14 @@
 # but we use lib for compatibility with 3rd party drivers (at upstream request).
 %global cups_serverbin %{_exec_prefix}/lib/cups
 
-%global prever rc1
-
-#%%global VERSION %%{version}
-%global VERSION %{version}%{prever}
-
 Summary: CUPS printing system
 Name: cups
 Epoch: 1
-Version: 2.0
-Release: 0.1.%{prever}%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 License: GPLv2
 Url: http://www.cups.org/
-Source: http://www.cups.org/software/%{VERSION}/cups-%{VERSION}-source.tar.bz2
+Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
 # Pixmap for desktop file
 Source2: cupsprinter.png
 # socket unit for cups-lpd service
@@ -191,7 +186,7 @@ lpd emulation.
 Sends IPP requests to the specified URI and tests and/or displays the results.
 
 %prep
-%setup -q -n cups-%{VERSION}
+%setup -q
 
 # Don't gzip man pages in the Makefile, let rpmbuild do it.
 %patch1 -p1 -b .no-gzip-man
@@ -539,11 +534,13 @@ rm -f %{cups_serverbin}/backend/smb
 %config(noreplace) %{_sysconfdir}/pam.d/cups
 %config(noreplace) %{_sysconfdir}/logrotate.d/cups
 %dir %{_datadir}/%{name}/www
+%dir %{_datadir}/%{name}/www/es
 %{_datadir}/%{name}/www/images
 %{_datadir}/%{name}/www/*.css
 %doc %{_datadir}/%{name}/www/index.html
 %doc %{_datadir}/%{name}/www/help
 %doc %{_datadir}/%{name}/www/robots.txt
+%doc %{_datadir}/%{name}/www/es/index.html
 %doc %{_datadir}/%{name}/www/apple-touch-icon.png
 %dir %{_datadir}/%{name}/usb
 %{_datadir}/%{name}/usb/org.cups.usb-quirks
@@ -578,7 +575,9 @@ rm -f %{cups_serverbin}/backend/smb
 # client subpackage
 %exclude %{_sbindir}/lpc.cups
 %dir %{_datadir}/cups/templates
+%dir %{_datadir}/cups/templates/es
 %{_datadir}/cups/templates/*.tmpl
+%{_datadir}/cups/templates/es/*.tmpl
 %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
 %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
 %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
@@ -640,6 +639,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Oct 01 2014 Jiri Popelka <jpopelka at redhat.com> - 1:2.0.0-1
+- 2.0.0
+
 * Fri Sep 12 2014 Jiri Popelka <jpopelka at redhat.com> - 1:2.0-0.1.rc1
 - 2.0rc1
 
diff --git a/sources b/sources
index db7b740..b335198 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13b36544402eabce8865a8a054d59663  cups-2.0rc1-source.tar.bz2
+2cdd81fea23e9e29555c24bdfd0d7c89  cups-2.0.0-source.tar.bz2