[mate-screensaver/f18] clean up commits patch
leigh123linux
leigh123linux at fedoraproject.org
Mon Nov 12 16:15:30 UTC 2012
commit b82ed6ea45e2b566ee7ce9167a676dab841dad5d
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Mon Nov 12 16:15:16 2012 +0000
clean up commits patch
mate-screensaver.spec | 5 +-
upstream_commits.patch | 315 ------------------------------------------------
2 files changed, 4 insertions(+), 316 deletions(-)
---
diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index 5f7fbcb..9a087ad 100644
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -1,6 +1,6 @@
Name: mate-screensaver
Version: 1.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MATE Screensaver
License: GPLv2+ and LGPLv2+
@@ -123,6 +123,9 @@ fi
%changelog
+* Mon Nov 12 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-3
+- clean up commits patch
+
* Mon Nov 12 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-2
- add upstream commits patch
- add buildrequires systemd-devel
diff --git a/upstream_commits.patch b/upstream_commits.patch
index 0f3d752..3acb040 100644
--- a/upstream_commits.patch
+++ b/upstream_commits.patch
@@ -62,204 +62,6 @@ diff -uNrp a/configure.ac b/configure.ac
libmatenotify support: ${have_libmatenotify}
PAM support: ${have_pam}
Have shadow passwords: ${have_shadow}
-diff -uNrp a/COPYING b/COPYING
---- a/COPYING 2012-11-03 19:51:10.000000000 +0000
-+++ b/COPYING 2012-11-12 05:33:34.000000000 +0000
-@@ -1,12 +1,12 @@
-- GNU GENERAL PUBLIC LICENSE
-- Version 2, June 1991
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-
-- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-- Preamble
-+ Preamble
-
- The licenses for most software are designed to take away your
- freedom to share and change it. By contrast, the GNU General Public
-@@ -15,7 +15,7 @@ software--to make sure the software is f
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it. (Some other Free Software Foundation software is covered by
--the GNU Library General Public License instead.) You can apply it to
-+the GNU Lesser General Public License instead.) You can apply it to
- your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-@@ -55,8 +55,8 @@ patent must be licensed for everyone's f
-
- The precise terms and conditions for copying, distribution and
- modification follow.
--
-- GNU GENERAL PUBLIC LICENSE
-+
-+ GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-@@ -110,7 +110,7 @@ above, provided that you also meet all o
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
--
-+
- These requirements apply to the modified work as a whole. If
- identifiable sections of that work are not derived from the Program,
- and can be reasonably considered independent and separate works in
-@@ -168,7 +168,7 @@ access to copy from a designated place,
- access to copy the source code from the same place counts as
- distribution of the source code, even though third parties are not
- compelled to copy the source along with the object code.
--
-+
- 4. You may not copy, modify, sublicense, or distribute the Program
- except as expressly provided under this License. Any attempt
- otherwise to copy, modify, sublicense or distribute the Program is
-@@ -225,11 +225,11 @@ impose that choice.
-
- This section is intended to make thoroughly clear what is believed to
- be a consequence of the rest of this License.
--
-+
- 8. If the distribution and/or use of the Program is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Program under this License
--may add an explicit geomraphical distribution limitation excluding
-+may add an explicit geographical distribution limitation excluding
- those countries, so that distribution is permitted only in or among
- countries not thus excluded. In such case, this License incorporates
- the limitation as if written in the body of this License.
-@@ -255,7 +255,7 @@ make exceptions for this. Our decision
- of preserving the free status of all derivatives of our free software and
- of promoting the sharing and reuse of software generally.
-
-- NO WARRANTY
-+ NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
-
-- END OF TERMS AND CONDITIONS
--
-- How to Apply These Terms to Your New Programs
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
-@@ -303,17 +303,16 @@ the "copyright" line and a pointer to wh
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
-- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Also add information on how to contact you by electronic and paper mail.
-
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
-
-- Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the
- This General Public License does not permit incorporating your program into
- proprietary programs. If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
--library. If this is what you want to do, use the GNU Library General
-+library. If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
-diff -uNrp a/COPYING.LIB b/COPYING.LIB
---- a/COPYING.LIB 2012-11-03 19:51:10.000000000 +0000
-+++ b/COPYING.LIB 2012-11-12 05:33:34.000000000 +0000
-@@ -1,16 +1,15 @@
--
-- GNU LIBRARY GENERAL PUBLIC LICENSE
-- Version 2, June 1991
-+ GNU LIBRARY GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
-- 675 Mass Ave, Cambridge, MA 02139, USA
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- [This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-- Preamble
-+ Preamble
-
- The licenses for most software are designed to take away your
- freedom to share and change it. By contrast, the GNU General Public
-@@ -100,7 +99,7 @@ works together with the library.
- Note that it is possible for a library to be covered by the ordinary
- General Public License rather than by this special one.
-
-- GNU LIBRARY GENERAL PUBLIC LICENSE
-+ GNU LIBRARY GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library which
-@@ -385,7 +384,7 @@ be a consequence of the rest of this Lic
- 12. If the distribution and/or use of the Library is restricted in
- certain countries either by patents or by copyrighted interfaces, the
- original copyright holder who places the Library under this License may add
--an explicit geomraphical distribution limitation excluding those countries,
-+an explicit geographical distribution limitation excluding those countries,
- so that distribution is permitted only in or among countries not thus
- excluded. In such case, this License incorporates the limitation as if
- written in the body of this License.
-@@ -412,7 +411,7 @@ decision will be guided by the two goals
- of all derivatives of our free software and of promoting the sharing
- and reuse of software generally.
-
-- NO WARRANTY
-+ NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
- WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-@@ -435,9 +434,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A
- SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGES.
-
-- END OF TERMS AND CONDITIONS
-+ END OF TERMS AND CONDITIONS
-
-- Appendix: How to Apply These Terms to Your New Libraries
-+ How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
- possible use to the public, we recommend making it free software that
-@@ -464,8 +463,8 @@ convey the exclusion of warranty; and ea
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
-- License along with this library; if not, write to the Free
-- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
- Also add information on how to contact you by electronic and paper mail.
-
diff -uNrp a/data/mate-screensaver-preferences.desktop.in b/data/mate-screensaver-preferences.desktop.in
--- a/data/mate-screensaver-preferences.desktop.in 2012-11-03 19:51:10.000000000 +0000
+++ b/data/mate-screensaver-preferences.desktop.in 2012-11-12 05:33:34.000000000 +0000
@@ -289,123 +91,6 @@ diff -uNrp a/data/org.mate.screensaver.gschema.xml.in b/data/org.mate.screensave
</schema>
</schemalist>
-
-diff -uNrp a/distro/archlinux/mate-screensaver.install b/distro/archlinux/mate-screensaver.install
---- a/distro/archlinux/mate-screensaver.install 1970-01-01 01:00:00.000000000 +0100
-+++ b/distro/archlinux/mate-screensaver.install 2012-11-12 05:33:34.000000000 +0000
-@@ -0,0 +1,18 @@
-+pkgname=mate-screensaver
-+
-+post_install() {
-+ usr/sbin/mateconfpkg --install ${pkgname}
-+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-+}
-+
-+pre_upgrade() {
-+ pre_remove $1
-+}
-+
-+post_upgrade() {
-+ post_install $1
-+}
-+
-+pre_remove() {
-+ usr/sbin/mateconfpkg --uninstall ${pkgname}
-+}
-diff -uNrp a/distro/archlinux/mate-screensaver.pam b/distro/archlinux/mate-screensaver.pam
---- a/distro/archlinux/mate-screensaver.pam 1970-01-01 01:00:00.000000000 +0100
-+++ b/distro/archlinux/mate-screensaver.pam 2012-11-12 05:33:34.000000000 +0000
-@@ -0,0 +1,3 @@
-+#%PAM-1.0
-+auth required pam_unix_auth.so
-+auth optional pam_gnome_keyring.so
-diff -uNrp a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
---- a/distro/archlinux/PKGBUILD 1970-01-01 01:00:00.000000000 +0100
-+++ b/distro/archlinux/PKGBUILD 2012-11-12 05:33:34.000000000 +0000
-@@ -0,0 +1,44 @@
-+pkgname=mate-screensaver
-+pkgver=1.1.0
-+pkgrel=1
-+pkgdesc='Screensaver for MATE'
-+arch=('i686' 'x86_64')
-+url="https://github.com/perberos/mate-screensaver"
-+license=('GPL')
-+depends=('gtk2' 'dbus' 'mate-conf' 'mate-desktop')
-+makedepends=('pkgconfig' 'intltool' 'mate-doc-utils')
-+options=('!libtool' '!emptydirs')
-+source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download
-+ mate-screensaver.pam)
-+install=mate-screensaver.install
-+sha256sums=('1dd5cbca9481c0f92b7a3337e05b42b49fd439e3a9a94ee1477046ae19fa884b'
-+ '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
-+
-+build() {
-+ # this is a hack for tarballs on github
-+ cd ${pkgname}
-+
-+ ./autogen.sh \
-+ --prefix=/usr --sysconfdir=/etc \
-+ --mandir=/usr/share \
-+ --disable-static \
-+ --with-xscreensaverdir=/usr/share/xscreensaver/config \
-+ --with-xscreensaverhackdir=/usr/lib/xscreensaver \
-+ --with-mit-ext \
-+ --libexecdir=/usr/lib/${pkgname} || return 1
-+
-+ make || return 1
-+}
-+
-+package() {
-+ # this is a hack for tarballs on github
-+ cd ${pkgname}
-+
-+ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install || return 1
-+
-+ install -m644 "${srcdir}/mate-screensaver.pam" "${pkgdir}/etc/pam.d/mate-screensaver"
-+
-+ install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
-+ mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
-+ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-+}
-diff -uNrp a/savers/cosmos-slideshow.desktop.in.in b/savers/cosmos-slideshow.desktop.in.in
---- a/savers/cosmos-slideshow.desktop.in.in 2012-11-03 19:51:10.000000000 +0000
-+++ b/savers/cosmos-slideshow.desktop.in.in 2012-11-12 05:33:34.000000000 +0000
-@@ -6,5 +6,5 @@ TryExec=@SAVERDIR@/slideshow
- StartupNotify=false
- Terminal=false
- Type=Application
--Categories=MATE;Screensaver;
-+Categories=System;Screensaver;
- OnlyShowIn=MATE;
-diff -uNrp a/savers/footlogo-floaters.desktop.in.in b/savers/footlogo-floaters.desktop.in.in
---- a/savers/footlogo-floaters.desktop.in.in 2012-11-03 19:51:10.000000000 +0000
-+++ b/savers/footlogo-floaters.desktop.in.in 2012-11-12 05:33:34.000000000 +0000
-@@ -6,5 +6,5 @@ TryExec=@SAVERDIR@/floaters
- StartupNotify=false
- Terminal=false
- Type=Application
--Categories=MATE;Screensaver;
-+Categories=System;Screensaver;
- OnlyShowIn=MATE;
-diff -uNrp a/savers/personal-slideshow.desktop.in.in b/savers/personal-slideshow.desktop.in.in
---- a/savers/personal-slideshow.desktop.in.in 2012-11-03 19:51:10.000000000 +0000
-+++ b/savers/personal-slideshow.desktop.in.in 2012-11-12 05:33:34.000000000 +0000
-@@ -6,5 +6,5 @@ TryExec=@SAVERDIR@/slideshow
- StartupNotify=false
- Terminal=false
- Type=Application
--Categories=MATE;Screensaver;
-+Categories=System;Screensaver;
- OnlyShowIn=MATE;
-diff -uNrp a/savers/popsquares.desktop.in.in b/savers/popsquares.desktop.in.in
---- a/savers/popsquares.desktop.in.in 2012-11-03 19:51:10.000000000 +0000
-+++ b/savers/popsquares.desktop.in.in 2012-11-12 05:33:34.000000000 +0000
-@@ -6,5 +6,5 @@ TryExec=@SAVERDIR@/popsquares
- StartupNotify=false
- Terminal=false
- Type=Application
--Categories=MATE;Screensaver;
-+Categories=System;Screensaver;
- OnlyShowIn=MATE;
diff -uNrp a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
--- a/src/gs-listener-dbus.c 2012-11-03 19:51:10.000000000 +0000
+++ b/src/gs-listener-dbus.c 2012-11-12 05:33:34.000000000 +0000
More information about the scm-commits
mailing list