dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 15:54:49 +00:00 · 2009-11-26 01:33:59 +00:00 · 2009-09-29 07:22:41 +00:00
5 changed files with 40 additions and 352 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,29 +1 @@
 xlockmore-5.28.tar.bz2
-/xlockmore-5.31.tar.bz2
-/xlockmore-5.34.tar.bz2
-/xlockmore-5.38.tar.bz2
-/xlockmore-5.40.tar.bz2
-/xlockmore-5.41.tar.bz2
-/xlockmore-5.43.tar.bz2
-/xlockmore-5.45.tar.bz2
-/xlockmore-5.46.tar.xz
-/xlockmore-5.47.tar.xz
-/xlockmore-5.49.tar.xz
-/xlockmore-5.51.tar.xz
-/xlockmore-5.53.tar.xz
-/xlockmore-5.55.tar.xz
-/xlockmore-5.56.tar.xz
-/xlockmore-5.59.tar.xz
-/xlockmore-5.60.tar.xz
-/xlockmore-5.61.tar.xz
-/xlockmore-5.63.tar.xz
-/xlockmore-5.64.tar.xz
-/xlockmore-5.66.tar.xz
-/xlockmore-5.67.tar.xz
-/xlockmore-5.70.tar.xz
-/xlockmore-5.74.tar.xz
-/xlockmore-5.77.tar.xz
-/xlockmore-5.81.tar.xz
-/xlockmore-5.86.tar.xz
-/xlockmore-5.87.tar.xz
-/xlockmore-5.88.tar.xz
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xlockmore-5.88.tar.xz) = 88bd987c6f1e1f03e8b9de11588a00d20c399cbf83858a5ff5b3573251bb0afa135a357661483f277b187e41a8d3255379f04ad8f351d610dacc13325a3943a3
+76bd1c42f1d1f2d9ea3d2d1837f7469e  xlockmore-5.28.tar.bz2
--- a/xlockmore-fix_petri.patch
+++ b/xlockmore-fix_petri.patch
@ -0,0 +1,11 @@
+--- modes/petri.c.orig	2009-08-20 08:05:37.000000000 +0200
+++ modes/petri.c	2009-08-20 08:05:46.000000000 +0200
+@@ -217,7 +217,7 @@
+    cell *arr;
+    cell *head;
+    cell *tail;
+-   int count;
+   unsigned int count;
+    Bool originalcolors;
+    GC *coloredGCs;
+    int blastcount;
--- a/xlockmore-ignore-void.patch
+++ b/xlockmore-ignore-void.patch
@ -1,56 +0,0 @@
--- a/xglock/xglock.c.orig	2026-02-04 14:55:58.908881606 +0100
-+++ b/xglock/xglock.c	2026-02-04 14:56:41.293020943 +0100
-@@ -714,7 +714,7 @@
-     struct_option_fntcol_callback *cbs_ptr =(struct_option_fntcol_callback *)udata;
-     gtk_widget_hide(cbs_ptr->fntcol_dialog);
-     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
-    (void) g_free(udata);
-+    g_free(udata);
- }
- 
- /*
-@@ -777,7 +777,7 @@
-     gtk_entry_set_text( GTK_ENTRY(cbs_ptr->entry), colorstr );
-     gtk_widget_hide( cbs_ptr->fntcol_dialog );
-     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
-    (void) g_free(udata);
-+    g_free(udata);
- }
- 
- /*
-@@ -910,7 +910,7 @@
-     struct_option_fntcol_callback *cbs_ptr = (struct_option_fntcol_callback *)udata;
-     gtk_widget_hide(cbs_ptr->fntcol_dialog);
-     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
-    (void) g_free(udata);
-+    g_free(udata);
- }
- 
- /*
-@@ -927,7 +927,7 @@
-     gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry),
-                        gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(cbs_ptr->fntcol_dialog)));
-     gtk_widget_destroy(cbs_ptr->fntcol_dialog);
-    (void) g_free(udata);
-+    g_free(udata);
- }
- 
- /*
-@@ -979,7 +979,7 @@
-     struct_option_fntcol_callback *cbs_ptr= (struct_option_fntcol_callback *)udata;
-     gtk_widget_hide( cbs_ptr->fntcol_dialog );
-     gtk_widget_destroy( cbs_ptr->fntcol_dialog );
-    (void) g_free(udata);
-+    g_free(udata);
- }
- 
- /*
-@@ -1002,7 +1002,7 @@
-         gtk_widget_hide(cbs_ptr->fntcol_dialog);
-         gtk_entry_set_text(GTK_ENTRY(cbs_ptr->entry), filename);
-         gtk_widget_destroy(cbs_ptr->fntcol_dialog);
-        (void) g_free(udata);
-+        g_free(udata);
-     }
- }
- 
--- a/xlockmore.spec
+++ b/xlockmore.spec
@ -1,29 +1,24 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.88
-Release: 2%{?dist}
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
-URL: http://sillycycle.com/xlockmore.html
-Source0: http://sillycycle.com/xlock/xlockmore-%{version}.tar.xz
-BuildRequires: make
-BuildRequires: gcc gcc-c++
-BuildRequires: pam-devel
+Version: 5.28
+Release: 1%{?dist}
+License: BSD
+Group: Amusements/Graphics
+URL: http://www.tux.org/~bagleyd/xlockmore.html
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2
+Patch0: xlockmore-fix_petri.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
 BuildRequires: desktop-file-utils libXdmcp-devel
-BuildRequires: motif-devel gtk2-devel
+BuildRequires: lesstif-devel gtk2-devel
 BuildRequires: libXau-devel
-Patch0: xlockmore-ignore-void.patch
-%if 0%{?rhel}
-Requires: gnome-icon-theme
-%else
-Requires: gnome-icon-theme-legacy
-%endif

 %description
 Locks the local X display until a password is entered.

 %package motif
+Group: Amusements/Graphics
 Summary: Motif based frontend for xlockmore
 Requires: %{name} = %{version}-%{release}

@ -31,6 +26,7 @@ Requires: %{name} = %{version}-%{release}
 Motif based frontend for xlockmore.

 %package gtk
+Group: Amusements/Graphics
 Summary: GTK based frontend for xlockmore
 Requires: %{name} = %{version}-%{release}

@ -39,27 +35,17 @@ GTK based frontend for xlockmore.

 %prep
 %setup -q
-%patch -P 0 -p 1
+%patch0

-%{__sed} -i -e "s,/lib,/%{_lib},g;s,-Wno-format,,g;" configure
-
-# See README for X(M)LOCKLDFLAGS explanation
-%{__sed} -i "/^XLOCKLDFLAGS$/d" configure
-%{__sed} -i "/^XMLOCKLDFLAGS$/d" configure
+%{__sed} -i -e "s,/lib,/%{_lib},g" configure

 %build
-%configure --with-crypt --enable-pam --enable-syslog --disable-setuid --disable-mb
-
-# Work around BZ#2341574
-sed -i 's/^CC =.*/\0 -std=c17/' xglock/Makefile
-
-# See README for X(M)LOCKLDFLAGS explanation
-sed -i 's/@XLOCKLDFLAGS@//' modes/Makefile
-sed -i 's/@XMLOCKLDFLAGS@//' xmlock/Makefile
-
+%configure \
+	--with-crypt --enable-pam --enable-syslog --disable-setuid
 %{__make} %{?_smp_mflags}

 %install
+%{__rm} -rf %{buildroot}
 %{__install} -D -m0755 xlock/xlock %{buildroot}%{_bindir}/xlock
 %{__install} -D -m0755 xmlock/xmlock %{buildroot}%{_bindir}/xmlock
 %{__install} -D -m0755 xglock/xglock %{buildroot}%{_bindir}/xglock
@ -86,21 +72,26 @@ cat >> %{buildroot}%{_datadir}/applications/%{name}.desktop << EOF
 Name=Xlock
 Comment=Screen Saver
 Encoding=UTF-8
-Icon=gnome-lockscreen
+Icon=gnome-lockscreen.png
 Exec=xlock
 Terminal=false
 Type=Application
 EOF

 desktop-file-install \
+	--vendor=fedora \
 	--dir %{buildroot}%{_datadir}/applications \
 	--delete-original \
 	--add-category X-Fedora \
 	--add-category Application \
 	--add-category Graphics \
-	%{buildroot}%{_datadir}/applications/%{name}.desktop
+        %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%clean
+%{__rm} -rf %{buildroot}

 %files
+%defattr(-, root, root, 0755)
 %doc README docs/*
 %doc %{_mandir}/man1/xlock.1*
 %{_bindir}/xlock
@ -109,245 +100,15 @@ desktop-file-install \
 %{_datadir}/applications/*

 %files motif
+%defattr(-, root, root, 0755)
 %{_bindir}/xmlock
 %{_libdir}/X11/app-defaults/XmLock

 %files gtk
+%defattr(-, root, root, 0755)
 %{_bindir}/xglock

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.88-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Mon Feb 09 2026 Adrian Reber <adrian@lisas.de> - 5.88-1
- Updated to 5.88 (#2425617)
-
-* Wed Feb 04 2026 Adrian Reber <adrian@lisas.de> - 5.87-2
- Updated to 5.87 (#2435197)
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 5.86-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Mon Dec 15 2025 Adrian Reber <adrian@lisas.de> - 5.86-1
- Updated to 5.86 (#2361972)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.81-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed Feb 19 2025 Martin Cermak <mcermak@redhat.com> - 5.81-1
- Updated to 5.81 (#1837169)
-
-* Tue Feb 18 2025 Martin Cermak <mcermak@redhat.com> - 5.77-5
- Updated for FTBFS (#2341574)
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.77-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 5.77-3
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.77-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu May 02 2024 Adrian Reber <adrian@lisas.de> - 5.77-1
- Updated to 5.77 (#1837169)
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Dec 12 2023 Adrian Reber <adrian@lisas.de> - 5.74-1
- Updated to 5.74 (#1837169)
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.70-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.70-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.70-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jul 13 2022 Adrian Reber <adrian@lisas.de> - 5.70-1
- Updated to 5.70 (#1837169)
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.67-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Aug 30 2021 Adrian Reber <adrian@lisas.de> - 5.67-1
- Updated to 5.67 (#1837169)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.66-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.66-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Oct 29 2020 Adrian Reber <adrian@lisas.de> - 5.66-1
- Updated to 5.66 (#1837169)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.64-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 30 2020 Adrian Reber <adrian@lisas.de> - 5.64-2
- Applied patch from Jan Kratochvil (#1852546)
-
-* Sun Jun 14 2020 Adrian Reber <adrian@lisas.de> - 5.64-1
- Updated to 5.64
-
-* Mon May 11 2020 Adrian Reber <adrian@lisas.de> - 5.63-1
- Updated to 5.63 (#1795091)
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.61-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Dec 17 2019 Adrian Reber <adrian@lisas.de> - 5.61-1
- Updated to 5.61 (#1762984)
- All patches have been upstreamed
-
-* Thu Dec 05 2019 Adrian Reber <adrian@lisas.de> - 5.60-1
- Updated to 5.60 (#1762984)
-
-* Sat Oct 05 2019 Adrian Reber <adrian@lisas.de> - 5.59-1
- Updated to 5.59
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.56-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.56-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 15 2019 Adrian Reber <adrian@lisas.de> - 5.56-1
- Updated to 5.56
-
-* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 5.55-6
- Rebuilt for libcrypt.so.2 (#1666033)
-
-* Wed Jul 18 2018 Adrian Reber <adrian@lisas.de> - 5.55-5
- Added BR: gcc-c++
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.55-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.55-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 5.55-2
- Rebuilt for switch to libxcrypt
-
-* Thu Aug 10 2017 Adrian Reber <adrian@lisas.de> - 5.55-1
- updated to 5.55
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.53-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.53-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Apr 25 2017 Adrian Reber <adrian@lisas.de> - 5.53-1
- updated to 5.53
-
-* Thu Mar 16 2017 Adrian Reber <adrian@lisas.de> - 5.51-1
- updated to 5.51
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.49-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 12 2016 Adrian Reber <adrian@lisas.de> - 5.49-2
- rebuilt
-
-* Sun Dec 11 2016 Adrian Reber <adrian@lisas.de> - 5.49-1
- updated to 5.49
-
-* Mon May 23 2016 Adrian Reber <adrian@lisas.de> - 5.47-1
- updated to 5.47
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.46-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Oct 06 2015 Adrian Reber <adrian@lisas.de> - 5.46-4
- link against openmotif instead of lesstif
- fixed a changelog date
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.46-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 5.46-2
- Rebuilt for GCC 5 C++11 ABI change
-
-* Sat Mar 21 2015 Adrian Reber <adrian@lisas.de> - 5.46-1
- updated to 5.46
-
-* Thu Jan 15 2015 Adrian Reber <adrian@lisas.de> - 5.45-1
- updated to 5.45
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.43-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.43-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Dec 22 2013  Sebastien Lugan <1698DA98@dynmail.crt1.net> - 5.43-4
- Fixed locale support "xlock need to enter password twice" (#991010)
-
-* Thu Dec 05 2013 Adrian Reber <adrian@lisas.de> - 5.43-3
- fixed "xlockmore FTBFS if "-Werror=format-security" flag is used" (#1037397)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.43-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 Adrian Reber <adrian@lisas.de> - 5.43-1
- updated to 5.43
- fixed "NULL pointer dereference leads to crash and bypass of screen lock" (#985542)
-
-* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 5.41-2
- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
- Cleanup spec as per recently changed packaging guidelines
-
-* Tue Nov 20 2012 Adrian Reber <adrian@lisas.de> - 5.41-1
- updated to 5.41
- dropped upstreamed patch for CVE-2012-4524
- fixed "xlock exits on segfault, unlocking the screen" (#874484)
-
-* Mon Oct 22 2012 Adrian Reber <adrian@lisas.de> - 5.40-4
- conditionalize icon BR
-
-* Thu Oct 18 2012 Adrian Reber <adrian@lisas.de> - 5.40-3
- fixed "CVE-2012-4524 xlockmore: Screensaver crash (screen lock bypass) when 'dclock' mode used" (#867908)
-
-* Thu Oct 18 2012 Adrian Reber <adrian@lisas.de> - 5.40-2
- removed esound-devel BR
-
-* Sun Oct 14 2012 Adrian Reber <adrian@lisas.de> - 5.40-1
- updated to 5.40
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.38-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Mar 25 2012 Adrian Reber <adrian@lisas.de> - 5.38-1
- updated to 5.38
- removed buildroot and clean section
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.34-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 5.34-2
- Rebuild for new libpng
-
-* Tue Jun 07 2011 Adrian Reber <adrian@lisas.de> - 5.34-1
- updated to 5.34
- fixed "Desktop file should not include extension..." (#701699)
- fixed "...missing Requires" (#701699); added R: gnome-icon-theme-legacy
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Nov 08 2010 Adrian Reber <adrian@lisas.de> - 5.31-1
- updated to 5.31
- removed xlockmore-fix_petri.patch
-
-* Sat May 08 2010 Adrian Reber <adrian@lisas.de> - 5.28-2
- fixed "FTBFS xlockmore-5.28-1.fc12: ImplicitDSOLinking" (#564929)
-
 * Sun Aug 30 2009 Adrian Reber <adrian@lisas.de> - 5.28-1
 - updated to 5.28
 - applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)
@ -367,7 +128,7 @@ desktop-file-install \
 * Sat Oct 13 2007 Adrian Reber <adrian@lisas.de> - 5.24-1
 - updated to 5.24

-* Tue Feb 06 2007 Adrian Reber <adrian@lisas.de> - 5.23-1
+* Tue Feb 08 2007 Adrian Reber <adrian@lisas.de> - 5.23-1
 - updated to 5.23

 * Tue Sep 12 2006 Adrian Reber <adrian@lisas.de> - 5.22-3
@ -403,7 +164,7 @@ desktop-file-install \
 * Wed Apr 13 2005 Adrian Reber <adrian@lisas.de> - 5.16-1
 - update to 5.16

-* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt

 * Thu Feb 24 2005 Adrian Reber <adrian@lisas.de> - 5.15-1
Author	SHA1	Message	Date
Fedora Release Engineering	3c329a976a	dist-git conversion	2010-07-29 15:54:49 +00:00
Bill Nottingham	149a061aa5	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:33:59 +00:00
Jesse Keating	dd7b591f9a	Initialize branch F-12 for xlockmore	2009-09-29 07:22:41 +00:00