diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index aaffde2..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -menu-cache-0.2.5.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..433ef5e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/menu-cache-*.tar.xz +/menu-cache-*.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 900be75..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: menu-cache -# $Id$ -NAME := menu-cache -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/create-menu-cache-git-bare-tarball.sh b/create-menu-cache-git-bare-tarball.sh new file mode 100644 index 0000000..5d59463 --- /dev/null +++ b/create-menu-cache-git-bare-tarball.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=menu-cache +GITURL=https://github.com/lxde/${REPONAME}.git + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/libfm-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL +tar czf ${TARNAME} ${REPONAME}.git/ + +pushd ${REPONAME}.git/ +git log --format=fuller | head -n 12 +popd + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/import.log b/import.log deleted file mode 100644 index 06bf3c0..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -menu-cache-0_2_2-1_fc11:HEAD:menu-cache-0.2.2-1.fc11.src.rpm:1235697658 diff --git a/menu-cache.spec b/menu-cache.spec index d6eb83e..391c032 100644 --- a/menu-cache.spec +++ b/menu-cache.spec @@ -1,16 +1,61 @@ +%global use_release 1 +%global use_git 0 +%global use_gitbare 0 + +%if 0%{?use_git} < 1 +%if 0%{?use_gitbare} < 1 +# force +%global use_release 1 +%endif +%endif + +%global git_version %{nil} +%global git_ver_rpm %{nil} +%global git_builddir %{nil} + +%if 0%{?use_gitbare} +%global gittardate 20250209 +%global gittartime 1612 + +%global gitbaredate 20250128 +%global git_rev 18bad9324b9e8990c73a67cee9b87d551d34be91 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version %{gitbaredate}git%{git_short} +%endif + +%if 0%{?use_git} || 0%{?use_gitbare} +%global git_ver_rpm ^%{git_version} +%global git_builddir -%{git_version} +%endif + + +%global main_version 1.1.1 + + Name: menu-cache -Version: 0.2.5 -Release: 1%{?dist} +Version: %{main_version}%{git_ver_rpm} +Release: 2%{?dist} Summary: Caching mechanism for freedesktop.org compliant menus -Group: System Environment/Libraries -License: LGPLv2+ and GPLv2+ +# SPDX confirmed +License: LGPL-2.0-or-later URL: http://lxde.org -Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?use_gitbare} +Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz +%endif +%if 0%{?use_release} +Source0: https://github.com/lxde/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +%endif +Source1: create-menu-cache-git-bare-tarball.sh -BuildRequires: glib2-devel >= 2.16.0 -Requires: redhat-menus +BuildRequires: make +BuildRequires: gcc +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libfm-extra) +BuildRequires: automake +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: /usr/bin/git %description Menu-cache is a caching mechanism for freedesktop.org compliant menus to @@ -19,9 +64,7 @@ components of the LXDE desktop environment such as LXPanel or LXLauncher. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -29,41 +72,63 @@ developing applications that use %{name}. %prep -%setup -q +%if 0%{?use_release} +%setup -q -n %{name}-%{main_version}%{git_builddir} +git init +%endif + +%if 0%{?use_gitbare} +%setup -q -c -T -n %{name}-%{main_version}%{git_builddir} -a 0 +git clone ./%{name}.git/ +cd %{name} + +git checkout -b %{main_version}-fedora %{git_rev} +cp -a [A-Z]* .. +%endif + +git config user.name "%{name} Fedora maintainer" +git config user.email "%{name}-maintainers@fedoraproject.org" + +%if 0%{?use_release} +git add . +git commit -m "base" -q +%endif + +sh autogen.sh %build -%configure --disable-static -make %{?_smp_mflags} +%if 0%{?use_gitbare} +cd %{name} +%endif +%configure --disable-static --disable-silent-rules +%make_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%if 0%{?use_gitbare} +cd %{name} +%endif +%make_install +find %{buildroot} -name '*.la' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root,-) #FIXME: add ChangeLog and NEWS if there is content -%doc AUTHORS COPYING README -%{_libexecdir}/menu-cache-gen -%{_libexecdir}/menu-cached -%{_libdir}/libmenu-cache.so.* +%doc AUTHORS +%license COPYING +%doc NEWS +%doc README +%{_libexecdir}/%{name}/menu-cache-gen +%{_libexecdir}/%{name}/menu-cached +%{_libdir}/libmenu-cache.so.3* #%{_mandir}/man*/*.gz %files devel -%defattr(-,root,root,-) %dir %{_includedir}/menu-cache/ %{_includedir}/menu-cache/*.h %{_libdir}/libmenu-cache.so @@ -71,6 +136,193 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Feb 16 2025 Mamoru TASAKA - 1.1.1-1 +- 1.1.1 + +* Sun Feb 09 2025 Mamoru TASAKA - 1.1.0^20250128git18bad932-1 +- Update to the latest git + +* Fri Jan 17 2025 Fedora Release Engineering - 1.1.0^20240821git83d90343-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sun Aug 25 2024 Mamoru TASAKA - 1.1.0^20240821git83d90343-1 +- Update to the latest git + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.0^20230724git4a82095c-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.0^20230724git4a82095c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.0^20230724git4a82095c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 21 2023 Mamoru TASAKA - 1.1.0^20230724git4a82095c-1 +- Update to the latest git + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.0-2.9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Than Ngo - 1.1.0-2.8 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.0-2.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.0-2.6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.0-2.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.0-2.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.0-2.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.0-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 23 2020 Mamoru TASAKA - 1.1.0-2 +- Fix compilation with gcc10 -fno-common + +* Fri Sep 20 2019 Zamir SUN - 1.1.0-1.5 +- Improve compatibility for epel7 +- Remove changelog that is out-of-order + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.0-1.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.0-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.0-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1.1.0-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 6 2017 Mamoru TASAKA - 1.1.0-1 +- 1.1.0 + +* Fri Sep 22 2017 Mamoru TASAKA - 1.0.2-7.D20170914git8c8534159d +- Update to the latest git + +* Wed Sep 13 2017 Mamoru TASAKA - 1.0.2-6.D20170913gitfd52af607c +- Update to the latest git + - Yet another possible fix for #7 + +* Thu Sep 7 2017 Mamoru TASAKA - 1.0.2-5.D20170905git2ef9df036c +- Update to the latest git + - github #13 #16 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.2-4.D20170514git56f6668459.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.2-4.D20170514git56f6668459.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Mamoru TASAKA - 1.0.2-4.D20170514git56f6668459 +- Update to the latest git + - use runtime home directory for socket path + instead of tmpdir + +* Sun Apr 23 2017 Mamoru TASAKA - 1.0.2-3.D20170419gitdffb1314ec +- Update to the latest git + - New API needed for new lxqt-runner (github #15) + +* Tue Apr 18 2017 Mamoru TASAKA - 1.0.2-2.D20170417git54ab9e4576 +- Update to the latest git + - Tentative fix for menu-cache-gen segv (sourceforge bug 863) + +* Fri Feb 10 2017 Fedora Release Engineering - 1.0.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 8 2016 Mamoru TASAKA - 1.0.2-1 +- 1.0.2 + +* Sun Oct 23 2016 Mamoru TASAKA - 1.0.1-3.D20161021git441f0ca9a1 +- Update to the latest git + +* Sat Aug 13 2016 Mamoru TASAKA - 1.0.1-2.D20160506git2932d67f30 +- Update to the latest git +- Backport 2 patches from my branch + - removal of monitored *.menu file triggers core dump (github#8) + - menu-cached utilize 100% CPU (github#7) + +* Thu Feb 04 2016 Fedora Release Engineering - 1.0.1-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Dec 8 2015 Mamoru TASAKA - 1.0.1-1 +- 1.0.1 + +* Sat Nov 28 2015 Mamoru TASAKA - 1.0.0-4.D20151128git0b1e85c263 +- Again try the latest git, this should fix bug 1264489 + +* Sat Nov 28 2015 Mamoru TASAKA - 1.0.0-3.D20151126git7e63ae3f66 +- Again try the latest git + +* Tue Nov 24 2015 Mamoru TASAKA - 1.0.0-2.D20151117git2d65876eb6 +- Try latest git + +* Wed Jun 17 2015 Mamoru TASAKA - 1.0.0-1 +- 1.0.0 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Nov 11 2013 Christoph Wickert - 0.5.1-1 +- Update to 0.5.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Nov 25 2012 Christoph Wickert - 0.4.1-1 +- Update to 0.4.1 + +* Fri Jul 20 2012 Fedora Release Engineering - 0.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 03 2012 Christoph Wickert - 0.3.3-2 +- No longer require redhat-menus + +* Sun Jun 03 2012 Christoph Wickert - 0.3.3-1 +- Update to 0.3.3 (#827783) + +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Feb 27 2010 Christoph Wickert - 0.3.2-1 +- Update to 0.3.2 + +* Sun Feb 21 2010 Christoph Wickert - 0.3.1-1 +- Update to 0.3.1 + +* Tue Nov 10 2009 Christoph Wickert - 0.2.6-1 +- Update to 0.2.6 + +* Sat Jul 25 2009 Fedora Release Engineering - 0.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Apr 28 2009 Christoph Wickert - 0.2.5-1 - Update to 0.2.5 diff --git a/sources b/sources index 2a163a3..7018d9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4537aba7abb379d5a055b2da5adb51bd menu-cache-0.2.5.tar.gz +SHA512 (menu-cache-1.1.1.tar.gz) = a2ede5663946d13a2992196a8547319ffa252cf5e37ba76dad559deb18450797ac6d5910415226ab996eab2131a2aa715b091a023a8a1eb39c83ea47043976e1