[packages/libdesktop-agnostic] - waf fixes for substitutions; separated vala-, python- -devel, -glade packages

Sat Dec 28 15:34:40 CET 2024

commit 1150c5f3df1d76eeb852261719a3bb3144fd9460
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 28 14:54:25 2024 +0100

    - waf fixes for substitutions; separated vala-, python- -devel, -glade packages

 libdesktop-agnostic-waf.patch | 59 +++++++++++++++++++++++++----------
 libdesktop-agnostic.spec      | 71 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 111 insertions(+), 19 deletions(-)
---

diff --git a/libdesktop-agnostic.spec b/libdesktop-agnostic.spec
index 61bc39a..239f967 100644
--- a/libdesktop-agnostic.spec
+++ b/libdesktop-agnostic.spec
@@ -61,6 +61,8 @@ Summary(pl.UTF-8):	Pliki programistyczne biblioteki libdesktop-agnostic
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-progs = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.18.0
+Requires:	gtk+2-devel >= 2:2.12.0
 
 %description devel
 This package contains the header files for developing applications
@@ -70,11 +72,37 @@ that use libdesktop-agnostic library.
 Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
 wykorzystujących bibliotekę libdesktop-agnostic.
 
+%package glade
+Summary:	Glade catalog file for libdesktop-agnostic library
+Summary(pl.UTF-8):	Plik katalogu Glade dla biblioteki libdesktop-agnostic
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description glade
+Glade catalog file for libdesktop-agnostic library.
+
+%description glade -l pl.UTF-8
+Plik katalogu Glade dla biblioteki libdesktop-agnostic.
+
+%package -n vala-libdesktop-agnostic
+Summary:	Vala API for libdesktop-agnostic library
+Summary(pl.UTF-8):	API języka Vala do biblioteki libdesktop-agnostic
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala >= 0.10
+
+%description -n vala-libdesktop-agnostic
+Vala API for libdesktop-agnostic library.
+
+%description -n vala-libdesktop-agnostic -l pl.UTF-8
+API języka Vala do biblioteki libdesktop-agnostic.
+
 %package -n python-desktop-agnostic
 Summary:	Python bindings for libdesktop-agnostic
 Summary(pl.UTF-8):	Wiązania Pythona do biblioteki libdesktop-agnostic
-Group:		Development/Languages
+Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-modules >= 1:2.5
 
 %description -n python-desktop-agnostic
 This package contains the Python bindings for the core library.
@@ -82,6 +110,21 @@ This package contains the Python bindings for the core library.
 %description -n python-desktop-agnostic -l pl.UTF-8
 Ten pakiet zawiera wiązania Pythona do głównej biblioteki.
 
+%package -n python-desktop-agnostic-devel
+Summary:	Development files for libdesktop-agnostic Python bindings
+Summary(pl.UTF-8):	Pliki programistyczne wiązan Pythona do biblioteki libdesktop-agnostic
+Group:		Development/Libraries
+Requires:	python-desktop-agnostic = %{version}-%{release}
+Requires:	python-devel >= 1:2.5
+Requires:	python-pygtk-devel >= 2:2.12.0
+
+%description -n python-desktop-agnostic-devel
+Development files for libdesktop-agnostic Python bindings.
+
+%description -n python-desktop-agnostic-devel -l pl.UTF-8
+Pliki programistyczne wiązan Pythona do biblioteki
+libdesktop-agnostic.
+
 %prep
 %setup -q
 # Use gladeui-2.0, not glade-1.0
@@ -169,10 +212,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdesktop-agnostic.so
 %{_includedir}/libdesktop-agnostic-1.0
 %{_pkgconfigdir}/desktop-agnostic.pc
-%{_datadir}/pygtk/2.0/defs/desktopagnostic*defs
-%{_datadir}/vala/vapi/desktop-agnostic*
+
+%files glade
+%defattr(644,root,root,755)
 %{_datadir}/glade/catalogs/desktop-agnostic.xml
 
+%files -n vala-libdesktop-agnostic
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/desktop-agnostic.deps
+%{_datadir}/vala/vapi/desktop-agnostic.vapi
+%{_datadir}/vala/vapi/desktop-agnostic-cfg.deps
+%{_datadir}/vala/vapi/desktop-agnostic-cfg.vapi
+%{_datadir}/vala/vapi/desktop-agnostic-fdo.deps
+%{_datadir}/vala/vapi/desktop-agnostic-fdo.vapi
+%{_datadir}/vala/vapi/desktop-agnostic-ui.deps
+%{_datadir}/vala/vapi/desktop-agnostic-ui.vapi
+%{_datadir}/vala/vapi/desktop-agnostic-vfs.deps
+%{_datadir}/vala/vapi/desktop-agnostic-vfs.vapi
+
 %files -n python-desktop-agnostic
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/desktopagnostic
@@ -182,3 +239,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/desktopagnostic/ui.so
 %attr(755,root,root) %{py_sitedir}/desktopagnostic/vfs.so
 %{py_sitedir}/desktopagnostic/*.py[co]
+
+%files -n python-desktop-agnostic-devel
+%defattr(644,root,root,755)
+%{_datadir}/pygtk/2.0/defs/desktopagnostic.defs
+%{_datadir}/pygtk/2.0/defs/desktopagnostic_config.defs
+%{_datadir}/pygtk/2.0/defs/desktopagnostic_fdo.defs
+%{_datadir}/pygtk/2.0/defs/desktopagnostic_ui.defs
+%{_datadir}/pygtk/2.0/defs/desktopagnostic_vfs.defs
diff --git a/libdesktop-agnostic-waf.patch b/libdesktop-agnostic-waf.patch
index 09b36e7..85313a7 100644
--- a/libdesktop-agnostic-waf.patch
+++ b/libdesktop-agnostic-waf.patch
@@ -1,5 +1,5 @@
---- libdesktop-agnostic-0.3.92/data/wscript.orig	2024-12-23 11:22:38.613314242 +0100
-+++ libdesktop-agnostic-0.3.92/data/wscript	2024-12-23 11:22:38.613314242 +0100
+--- libdesktop-agnostic-0.3.92/data/wscript.orig	2024-12-28 14:28:49.649117342 +0100
++++ libdesktop-agnostic-0.3.92/data/wscript	2024-12-28 14:33:08.537714822 +0100
 @@ -1,12 +1,10 @@
  #!/usr/bin/env python
  # encoding: utf-8
@@ -15,7 +15,7 @@
      opt.add_option('--with-glade', action='store_true',
                     dest='glade', default=False,
                     help='Installs the Glade catalog for the ' \
-@@ -17,14 +15,13 @@ def configure(conf):
+@@ -17,35 +15,32 @@ def configure(conf):
      conf.env['GLADE_SUPPORT'] = Options.options.glade
      if conf.env['GLADE_SUPPORT']:
          conf.check_cfg(package='gladeui-2.0', uselib_store='GLADEUI',
@@ -33,24 +33,30 @@
 +    pc = bld(features='subst')
      pc.source = 'desktop-agnostic.pc.in'
      pc.target = 'desktop-agnostic.pc'
-     pc.dict = {
-@@ -34,10 +31,9 @@ def build(bld):
+-    pc.dict = {
++    pc.__dict__.update({
+         'API_VERSION': bld.env['API_VERSION'],
+         'LIBDIR': bld.env['LIBDIR'],
+         'VERSION': bld.env['VERSION'],
          'prefix': bld.env['PREFIX'],
          'datarootdir': bld.env['DATADIR'],
-         }
+-        }
 -    pc.fun = misc.subst_func
++        })
      pc.install_path = '${LIBDIR}/pkgconfig'
  
 -    ini = bld.new_task_gen('subst')
 +    ini = bld(features='subst')
      ini.source = 'desktop-agnostic.ini.in'
      ini.target = 'desktop-agnostic.ini'
-     ini.dict = {
-@@ -45,7 +41,6 @@ def build(bld):
+-    ini.dict = {
++    ini.__dict__.update({
+         'CONFIG_BACKEND': bld.env['BACKENDS_CFG'][0],
          'VFS_BACKEND': bld.env['BACKENDS_VFS'][0],
          'DESKTOP_ENTRY_BACKEND': bld.env['BACKENDS_DE'][0],
-     }
+-    }
 -    ini.fun = misc.subst_func
++    })
      ini.install_path = '${SYSCONFDIR}/xdg/libdesktop-agnostic'
  
      if bld.env['GLADE_SUPPORT']:
@@ -256,7 +262,7 @@
 -    bld.new_task_gen(features='intltool_po', appname='libdesktop-agnostic')
 +    bld(features='intltool_po', appname='libdesktop-agnostic')
 --- libdesktop-agnostic-0.3.92/python/wscript.orig	2011-03-12 15:14:23.000000000 +0100
-+++ libdesktop-agnostic-0.3.92/python/wscript	2024-12-27 16:40:24.123254470 +0100
++++ libdesktop-agnostic-0.3.92/python/wscript	2024-12-28 14:33:31.757589030 +0100
 @@ -4,10 +4,8 @@
  # PyGObject bindings generator (until the gi module is stable)
  # copied/modified from gnome-python-desktop
@@ -331,10 +337,12 @@
 +    init = bld(features='subst')
      init.source = '__init__.py.in'
      init.target = '__init__.py'
-     init.dict = {
+-    init.dict = {
++    init.__dict__.update({
          'VERSION': bld.env['VERSION'],
-     }
+-    }
 -    init.fun = misc.subst_func
++    })
      init.install_path = '${PYTHONDIR}/desktopagnostic'
  
  # vim: set ts=4 sts=4 sw=4 et :
@@ -402,7 +410,7 @@
 +    launcher.includes = '..'
      launcher.target = 'lda-desktop-entry-editor'
 --- libdesktop-agnostic-0.3.92/wscript.orig	2011-03-13 16:09:47.000000000 +0100
-+++ libdesktop-agnostic-0.3.92/wscript	2024-12-23 11:22:38.616647557 +0100
++++ libdesktop-agnostic-0.3.92/wscript	2024-12-28 14:39:39.595596280 +0100
 @@ -1,16 +1,12 @@
  #! /usr/bin/env python
  # encoding: utf-8
@@ -478,7 +486,16 @@
  
      conf.define('API_VERSION', str(API_VERSION))
      conf.define('VERSION', str(VERSION))
-@@ -189,12 +186,12 @@ version %d.%d.%d''' % ((str(conf.env['VA
+@@ -169,6 +166,8 @@ version %d.%d.%d''' % ((str(conf.env['VA
+     conf.define('PACKAGE', APPNAME)
+     conf.define('LIBDIR', conf.env['LIBDIR'])
+     conf.define('SYSCONFDIR', conf.env['SYSCONFDIR'])
++    conf.env['VERSION'] = str(VERSION)
++    conf.env['API_VERSION'] = str(API_VERSION)
+ 
+     if conf.env['DEBUG']:
+         conf.env.append_value('VALAFLAGS', '-g')
+@@ -189,12 +188,12 @@ version %d.%d.%d''' % ((str(conf.env['VA
  
  def build(bld):
      # process subfolders from here
@@ -494,7 +511,7 @@
      old = cls.run
  
      def run(self):
-@@ -207,7 +204,7 @@ def build(bld):
+@@ -207,7 +206,7 @@ def build(bld):
              d = bld.path.abspath()
              latest_input = 0
              for x in self.inputs:
@@ -503,7 +520,7 @@
                  if timestamp > latest_input:
                      latest_input = timestamp
              # we need two passes to check that we have up-to-date C sources
-@@ -224,7 +221,7 @@ def build(bld):
+@@ -224,7 +223,7 @@ def build(bld):
              for x in self.outputs:
                  subdir = x.parent.path_to_parent(x.__class__.bld.srcnode)
                  src = os.path.join(d, GEN_SRC_DIR, subdir, x.name)
@@ -512,3 +529,13 @@
              return 0
      cls.run = run
  
+--- libdesktop-agnostic-0.3.92/data/desktop-agnostic.pc.in.orig	2024-12-28 13:49:12.675327848 +0100
++++ libdesktop-agnostic-0.3.92/data/desktop-agnostic.pc.in	2024-12-28 13:49:15.345313384 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBDIR@
+ includedir=${prefix}/include
+ defsdir=@datarootdir@/pygtk/2.0/defs
+ vapidir=@datarootdir@/vala/vapi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdesktop-agnostic.git/commitdiff/b8be75444bbf755f7afa2458cac541a4d322b80e

