diff --git a/garcon-0.7.0.tar.bz2 b/garcon-0.7.0.tar.bz2 new file mode 100644 index 0000000..d0bc502 Binary files /dev/null and b/garcon-0.7.0.tar.bz2 differ diff --git a/garcon-0.8.0.tar.bz2 b/garcon-0.8.0.tar.bz2 deleted file mode 100644 index d889342..0000000 Binary files a/garcon-0.8.0.tar.bz2 and /dev/null differ diff --git a/garcon-4.16-menus.patch b/garcon-4.16-menus.patch deleted file mode 100644 index 9c3d561..0000000 --- a/garcon-4.16-menus.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- garcon-4.16.1-orig/data/xfce/xfce-applications.menu 2020-05-25 16:32:47.000000000 -0400 -+++ garcon-4.16.1/data/xfce/xfce-applications.menu 2021-02-05 19:37:50.883567150 -0500 -@@ -20,6 +20,7 @@ - xfce4-web-browser.desktop - - Settings -+ Administration - - - -@@ -40,13 +41,20 @@ - - - -- -- Screensavers -- xfce-screensavers.directory -- -- Screensaver -- -- -+ -+ -+ -+ Administration -+ SystemConfig.directory -+ -+ -+ Settings -+ System -+ Screensaver -+ -+ gpk-application.desktop -+ gpk-update-viewer.desktop -+ - - - -@@ -71,6 +79,14 @@ - - - -+ Documentation -+ Documentation.directory -+ -+ Documentation -+ -+ -+ -+ - Development - xfce-development.directory - diff --git a/garcon.spec b/garcon.spec index 0fcd7b9..8741bcf 100644 --- a/garcon.spec +++ b/garcon.spec @@ -1,97 +1,70 @@ -%global minorversion 4.16 -%global xfceversion 4.16 -%global namespc Garcon - +%global xfceversion 4.14 Name: garcon -Version: 0.8.0 +Version: 0.7.0 Release: 1 Summary: Implementation of the freedesktop.org menu specification - -# garcon's source code is licensed under the LGPLv2+, -# while its documentation is licensed under the GFDL 1.1 License: LGPLv2+ and GFDL URL: http://xfce.org/ -Source0: http://archive.xfce.org/src/xfce/%{name}/0.8/%{name}-%{version}.tar.bz2 -Source1: xfce-documentation.directory -Patch0: garcon-%{xfceversion}-menus.patch - +Source0: http://archive.xfce.org/src/libs/%{name}/0.7/%{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 -BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion} -BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} BuildRequires: pkgconfig(gio-2.0) >= 2.30.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 BuildRequires: pkgconfig(gthread-2.0) >= 2.30.0 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 +BuildRequires: gobject-introspection-devel +BuildRequires: libxfce4ui-devel +BuildRequires: libxfce4util-devel BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: gettext BuildRequires: intltool -BuildRequires: gobject-introspection-devel -BuildRequires: make - -Obsoletes: libxfce4menu < 4.6.3 -# because of %%{_datadir}/desktop-directories/xfce-* -Conflicts: xfdesktop <= 4.6.2 %description -Garcon is an implementation of the freedesktop.org menu specification replacing -the former Xfce menu library libxfce4menu. It is based on GLib/GIO only and -aims at covering the entire specification except for legacy menus. +Garcon is a freedesktop.org compliant menu implementation based +on GLib and GIO. It was started as a complete rewrite of the former +Xfce menu library called libxfce4menu, which, in contrast to garcon, +was lacking menu merging features essential for loading menus modified +with menu editors. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} Requires: gtk2-devel Requires: pkgconfig -Obsoletes: libxfce4menu-devel < 4.6.2 %description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - +This package contains libraries and header files for developing applications that use garcon. %prep %setup -q -%patch0 -p1 -b.menus - %build %configure --disable-static --enable-gtk-doc %make_build - %install %make_install -# fix permissions for libraries -chmod 755 %{buildroot}/%{_libdir}/*.so - -find %{buildroot} -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %find_lang %{name} -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories %files -f %{name}.lang %license COPYING -%doc AUTHORS ChangeLog NEWS +%doc AUTHORS ChangeLog NEWS README %config(noreplace) %{_sysconfdir}/xdg/menus/xfce-applications.menu %{_libdir}/*.so.* -%{_libdir}/girepository-1.0/%{namespc}* -%{_datadir}/icons/hicolor/32x32/apps/org.xfce.garcon.png -%{_datadir}/gir-1.0/%{namespc}* %{_datadir}/desktop-directories/*.directory %files devel %doc HACKING STATUS TODO +%doc %{_datadir}/gtk-doc/ %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%doc %{_datadir}/gtk-doc/ %changelog -* Fri Jun 18 2021 zhanglin - 0.8.0-1 -- Update to 0.8.0 - * Tue Jul 7 2020 Dillon Chen - 0.7.0-1 - Init Package diff --git a/xfce-documentation.directory b/xfce-documentation.directory deleted file mode 100644 index 48000c6..0000000 --- a/xfce-documentation.directory +++ /dev/null @@ -1,139 +0,0 @@ -[Desktop Entry] -Name=Documentation -Name[af]=Dokumentasie -Name[am]=ማስረጃ -Name[ar]=وثائق -Name[as]=আলেখ্যন -Name[be]=Дакумэнтацыя -Name[bg]=Документация -Name[bn]=ডকুমেন্টেশন -Name[bn_IN]=নথিপত্র -Name[ca]=Documentació -Name[cs]=Dokumentace -Name[cy]=Dogfennau -Name[da]=Dokumentation -Name[de]=Dokumentation -Name[el]=Τεκμηρίωση -Name[en_GB]=Documentation -Name[es]=Documentación -Name[et]=Dokumentatsioon -Name[fa]=مستندات -Name[fi]=Ohjeet -Name[fr]=Documentation -Name[gl]=Documentación -Name[gu]=દસ્તાવેજીકરણ -Name[he]=תיעוד -Name[hi]=दस्तावेज़ीकरण -Name[hr]=Dokumentacija -Name[hu]=Dokumentáció -Name[hy]=Դոկումենտացիա -Name[id]=Dokumentasi -Name[is]=Handbækur -Name[it]=Documentazione -Name[ja]=ドキュメント -Name[ka]=დოკუმენტაცია -Name[kn]=ದಸ್ತಾವೇಜೀಕರಣ -Name[ko]=문서 자료 -Name[lt]=Dokumentacija -Name[lv]=Dokumentācija -Name[mk]=Документација -Name[ml]=വിവരണക്കുറിപ്പു് (ഡോക്യുമെന്‍റേഷന്‍) -Name[mr]=दस्तऐवजीकरण -Name[ms]=Dokumentasi -Name[nb]=Dokumentasjon -Name[nl]=Documentatie -Name[nso]=Go dira ditokumente -Name[or]=ଦଲିଲକରଣ -Name[pa]=ਡੌਕੂਮੈਂਟੇਸ਼ਨ -Name[pl]=Dokumentacja -Name[pt]=Documentação -Name[pt_BR]=Documentação -Name[ro]=Documentaţie -Name[ru]=Документация -Name[si]=ලේඛණයන් -Name[sk]=Dokumentácia -Name[sl]=Dokumentacija -Name[sr]=Документација -Name[sr@latin]=Dokumentacija -Name[sv]=Dokumentation -Name[ta]=ஆவணமாக்கல் -Name[te]=పత్రికీకరణ -Name[th]=เอกสารประกอบ -Name[tr]=Belgelendirme -Name[uk]=Документація -Name[ur]=دستا و یزی شہا دت -Name[vi]=Tài liệu -Name[zh_CN]=文档 -Name[zh_TW]=說明文件 -Name[zu]=Ukushicilelwa -Comment=Manuals and help documents -Comment[af]=Handleidings en hulpdokumente -Comment[am]=የአሠራር መምሪያዎች እና መርጃ ሰነዶች -Comment[ar]=الدلائل ووثائق المساعدة -Comment[as]=হাতপুথি আৰু সহায়ক আলেখ -Comment[be]=Кіраўніцтвы й дакумэнты даведкі -Comment[bg]=Ръководства и помощни документи -Comment[bn]=নির্দেশিকা ও সহায়িকার ডকুমেন্ট -Comment[bn_IN]=নির্দেশিকা ও সহায়িকা -Comment[ca]=Manuals i documents d'ajuda -Comment[cs]=Manuály a dokumenty nápovědy -Comment[cy]=Llawlyfrau a dogfennau cymorth -Comment[da]=Manualer og hjælpedokumenter -Comment[de]=Handbücher und Hilfe-Dokumente -Comment[el]=Εγχειρίδια και έγγραφα βοήθειας -Comment[en_GB]=Manuals and help documents -Comment[es]=Manuales y documentación de ayuda -Comment[et]=Käsiraamatud ja abidokumendid -Comment[fa]=کتب راهنما -Comment[fi]=Manuaalit ja ohjeet -Comment[fr]=Manuels et documents d'aide -Comment[gl]=Manuais e documentos de axuda -Comment[gu]=મદદપત્રો અને મદદના દસ્તાવેજો -Comment[he]=מדריכים ומסמכי עזרה -Comment[hi]=निर्देश पुस्तिका और मदद दस्तावेज़ -Comment[hr]=Priručnici i dokumentacija pomoći -Comment[hu]=Kézikönyvek és leírások -Comment[hy]=Ձեռնարկներ և օգնություն -Comment[id]=Manual dan dokumen bantuan -Comment[ilo]=Manual ken kasuratan ti tulong -Comment[is]=Handbækur og önnur hjálparskjöl -Comment[it]=Manuali e guide -Comment[ja]=マニュアルとヘルプのドキュメント -Comment[ka]=ინსტრუქციები და დამხმარე დოკუმენტები -Comment[kn]=ಕೈಪಿಡಿಗಳು ಮತ್ತು ಸಹಾಯಕ ದಸ್ತಾವೇಜುಗಳು -Comment[ko]=메뉴얼과 도움말 문서 자료 -Comment[lt]=Aprašymai ir pagalbos dokumentai -Comment[lv]=Rokasgrāmatas un palīgdokumentācija -Comment[mk]=Документи и прирачници за помош -Comment[ml]=മാനുവലുകളും സഹായ വിവരണങ്ങളും -Comment[mr]=हस्तपुस्तिका आणि सहाय्यक दस्तऐवजे -Comment[ms]=Manual dan dokumen bantuan -Comment[nb]=Håndbøker og hjelpdokumenter -Comment[nl]=Handboeken en hulpdocumenten -Comment[nso]=Dipukwana le ditokumente tša thušo -Comment[or]=ସହାୟକ ପୁସ୍ତକ ଏବଂ ସାହାଯ୍ଯ ଦଲିଲ -Comment[pa]=ਮੈਨੁਅਲ ਅਤੇ ਮੱਦਦ ਡੌਕੂਮੈਂਟੇਸ਼ਨ -Comment[pl]=Podręczniki i dokumenty pomocy -Comment[pt]=Manuais e documentos de ajuda -Comment[pt_BR]=Manuais e documentos de ajuda -Comment[ro]=Manuale şi documente de ajutor -Comment[ru]=Руководства и справочные документы -Comment[si]=අත් පොත් සහ උපකාරක ලේඛන -Comment[sk]=Príručky a návody -Comment[sl]=Priročniki in dokumenti s pomočjo -Comment[sr]=Приручници и помоћна документација -Comment[sr@latin]=Priručnici i pomoćna dokumentacija -Comment[sv]=Manualer och hjälpdokument -Comment[ta]=கையேடுகள் மற்றும் உதவி ஆவணங்கள் -Comment[te]=నిబంధనపత్రం మరియూ ప్రామాణిక పత్రాలు -Comment[th]=คู่มือและเอกสารช่วยเหลือ -Comment[tr]=Kılavuzlar ve yardım belgeleri -Comment[uk]=Посібники та довідникові документи -Comment[ur]=ھیلپ اور دستو رالعمل -Comment[vi]=Tài liệu trợ giúp -Comment[zh_CN]=说明手册和帮助文档 -Comment[zh_TW]=使用手冊與說明文件 -Comment[zu]=Imiqulu kanye nemibhalo yokushicilela -Icon=help-browser -Type=Directory -Encoding=UTF-8