diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..9b7c16d48bd159875d83e4763fc63b46ce1bd58f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..9e8573a05804cce08e70596a9971c9f5abf05c44 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/geany diff --git a/geany-2.0.tar.bz2 b/geany-2.0.tar.bz2 deleted file mode 100644 index 9f69f6ec678dfeb0a2f716890d5143f094c6b5b8..0000000000000000000000000000000000000000 Binary files a/geany-2.0.tar.bz2 and /dev/null differ diff --git a/geany-2.1.tar.bz2 b/geany-2.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..2a806012f4bd390022b6e099a70c27e277c432f6 --- /dev/null +++ b/geany-2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b96a8844463300c10b9692a0a5edad8236eec9e84342f575f83d4fc89331228 +size 6908595 diff --git a/geany.spec b/geany.spec index 9d1d3eb411fabf0d37e4f79144b55ea753db5c19..9a060a10e456d0bc06f6cf60ae61199d4bfe2a61 100644 --- a/geany.spec +++ b/geany.spec @@ -1,19 +1,22 @@ -%global geany_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} +# The Python templates in /usr/share/geany/templates can not be byte-compiled. %undefine py_auto_byte_compile Name: geany -Version: 2.0 -Release: 1%{?dist} +Version: 2.1 +Release: 1 Summary: A fast and lightweight IDE using GTK3 -License: GPLv2+ and MIT -URL: http://www.geany.org/ -Source0: http://download.geany.org/%{name}-%{version}.tar.bz2 +License: GPL-2.0-or-later and MIT +URL: https://www.geany.org/ +Source0: https://download.geany.org/%{name}-%{version}.tar.bz2 BuildRequires: gcc gcc-c++ BuildRequires: python3-docutils -BuildRequires: desktop-file-utils, gettext, pango-devel, intltool -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: gettext intltool +BuildRequires: pkgconfig(gio-2.0) >= 2.56 +BuildRequires: pkgconfig(glib-2.0) >= 2.56 +BuildRequires: pkgconfig(gmodule-no-export-2.0) +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24 BuildRequires: perl(XML::Parser) BuildRequires: make @@ -25,14 +28,10 @@ Provides: bundled(lexilla) = 5.2.7 Recommends: xterm - %description Geany is a small and fast integrated development environment with basic features and few dependencies to other packages or Desktop Environments. - - - %package libgeany Summary: Core functions of Geany Requires: geany = %{version}-%{release} @@ -46,7 +45,6 @@ Geany plugins. %package devel Summary: Header files for building Geany plug-ins Requires: geany = %{version}-%{release} -Requires: pkgconfig gtk3-devel %description devel This package contains the header files and pkg-config file needed for building @@ -57,44 +55,54 @@ Geany plug-ins. You do not need to install this package to use Geany. rm -f waf rm -f wscript +cp scintilla/License.txt ScintillaLicense.txt +cp scintilla/lexilla/License.txt LexillaLicense.txt + +mkdir html +cp -fr doc/geany.html html/index.html +cp -fr doc/images html/ %build RST2HTML=/usr/bin/rst2html-3 -%configure --docdir=%{geany_docdir} --enable-gtk3 -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%configure --enable-gtk3 +%disable_rpath +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=$RPM_BUILD_ROOT/%{geany_docdir} +%make_install +%delete_la + rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico -desktop-file-install --delete-original \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --mode 0644 \ - $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop -%find_lang %{name} -find $RPM_BUILD_ROOT -name "*.la" -delete +rm -fr %{buildroot}%{_datadir}/doc/geany + +%find_lang %{name} %files -f %{name}.lang -%exclude %{geany_docdir}/TODO -%doc %{geany_docdir} -%doc %{_mandir}/man1/geany.1* +%license COPYING ScintillaLicense.txt LexillaLicense.txt +%doc README NEWS AUTHORS THANKS TODO +%doc html %{_bindir}/%{name} %{_datadir}/%{name} %{_libdir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/*/*/*/*.svg -%{_datadir}/icons/*/*/*/*.png +%{_datadir}/icons/*/*/*/* +%{_mandir}/man1/* + %files libgeany -%{_libdir}/libgeany.so* +%{_libdir}/libgeany.so.* + %files devel %doc HACKING TODO %{_includedir}/geany +%{_libdir}/libgeany.so %{_libdir}/pkgconfig/geany.pc %changelog +* Tue Jul 22 2025 Funda Wang - 2.1-1 +- update to 2.1 + * Tue Dec 26 2023 zke_012020 <19966422680@163.com> - 2.0-1 - New upstream release: Geany 2.0