Page MenuHomeSolus

D595.id1283.diff
No OneTemporary

D595.id1283.diff

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -454,6 +454,7 @@
libavahi-gobject.so.0:ga_client_get_type
libavahi-gobject.so.0:ga_client_new
libavahi-gobject.so.0:ga_client_start
+libavahi-gobject.so.0:ga_client_start_in_context
libavahi-gobject.so.0:ga_client_state_get_type
libavahi-gobject.so.0:ga_entry_group_add_record
libavahi-gobject.so.0:ga_entry_group_add_record_full
diff --git a/actions.py b/actions.py
deleted file mode 100644
--- a/actions.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python
-
-
-from pisi.actionsapi import shelltools, get, autotools, pisitools
-
-shelltools.export("HOME", get.workDIR())
-
-
-def setup():
- autotools.autoreconf("-vfi")
- autotools.configure("--disable-static \
- --disable-mono \
- --disable-monodoc \
- --disable-python \
- --disable-qt3 \
- --disable-qt4 \
- --disable-gtk3 \
- --disable-gtk \
- --enable-compat-libdns_sd \
- --enable-core-docs \
- --with-distro=none")
-
-
-def build():
- autotools.make()
-
-
-def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
- pisitools.dodoc("ChangeLog", "LICENSE")
- pisitools.removeDir("/var/run")
- pisitools.removeDir("/var")
- pisitools.dosym("/usr/include/avahi-compat-libdns_sd/dns_sd.h", "/usr/include/dns_sd.h")
diff --git a/comar/package.py b/comar/package.py
deleted file mode 100644
--- a/comar/package.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-
-import os, re
-
-OUR_ID = 84
-OUR_NAME = "avahi"
-OUR_DESC = "Avahi Daemon Owner"
-
-
-def postInstall(fromVersion, fromRelease, toVersion, toRelease):
- try:
- os.system ("groupadd -g %d %s" % (OUR_ID, OUR_NAME))
- os.system ("useradd -m -d /var/run/avahi -r -s /bin/false -u %d -g %d %s -c \"%s\"" % (OUR_ID, OUR_ID, OUR_NAME, OUR_DESC))
- except:
- pass
-
-def postRemove():
- try:
- os.system ("userdel %s" % OUR_NAME)
- os.system ("groupdel %s" % OUR_NAME)
- except:
- pass
diff --git a/component.xml b/component.xml
deleted file mode 100644
--- a/component.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<PISI>
- <Name>desktop.core</Name>
-</PISI>
diff --git a/files/avahi.sysusers b/files/avahi.sysusers
new file mode 100644
--- /dev/null
+++ b/files/avahi.sysusers
@@ -0,0 +1,2 @@
+g avahi 84 -
+u avahi 84 "Avahi Daemon Owner" /run/avahi
diff --git a/files/avahi.tmpfiles b/files/avahi.tmpfiles
new file mode 100644
--- /dev/null
+++ b/files/avahi.tmpfiles
@@ -0,0 +1 @@
+d /run/avahi-daemon 0755 - - -
diff --git a/files/dede2a12d0bcc6ae9daf2a4671f0d618eeb44425.patch b/files/dede2a12d0bcc6ae9daf2a4671f0d618eeb44425.patch
deleted file mode 100644
--- a/files/dede2a12d0bcc6ae9daf2a4671f0d618eeb44425.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From dede2a12d0bcc6ae9daf2a4671f0d618eeb44425 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 6 Mar 2016 13:56:55 +0100
-Subject: [PATCH] configure.ac: Fix libavahi-client test
-
-This only affected the report at the end of configure.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 87a9a17..2892967 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1185,7 +1185,7 @@ fi
-
- BUILD_CLIENT="no (You need avahi-daemon and D-Bus!)"
-
--if "x$HAVE_DBUS" = "xyes" ; then
-+if test "x$HAVE_DBUS" = "xyes" ; then
- BUILD_CLIENT=yes
- fi
-
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,39 @@
+name : avahi
+version : 0.7
+release : 8
+source :
+ - https://github.com/lathiat/avahi/releases/download/v0.7/avahi-0.7.tar.gz : 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+license : LGPL-2.1
+component : desktop.core
+summary : mDNS/DNS-SD service discovery
+description: |
+ Avahi is a system which facilitates service discovery on a local network
+ via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop
+ or computer into a network and instantly be able to view other people who
+ you can chat with, find printers to print to or find files being shared.
+ Compatible technology is found in Apple MacOS X (branded ​Bonjour and
+ sometimes Zeroconf).
+builddeps :
+ - pkgconfig(libdaemon)
+setup : |
+ %reconfigure --disable-static \
+ --disable-mono \
+ --disable-monodoc \
+ --disable-python \
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-gtk \
+ --disable-gtk3 \
+ --enable-compat-libdns_sd \
+ --enable-core-docs \
+ --with-systemdsystemunitdir=%libdir%/systemd/system \
+ --with-distro=none
+build : |
+ %make
+install : |
+ %make_install
+ rm -frv $installdir/run
+ ln -s /usr/include/avahi-compat-libdns_sd/dns_sd.h $installdir/usr/include/dns_sd.h
+
+ install -D -m 00644 $pkgfiles/avahi.sysusers $installdir%libdir%/sysusers.d/avahi.conf
+ install -D -m 00644 $pkgfiles/avahi.tmpfiles $installdir%libdir%/tmpfiles.d/avahi.conf
diff --git a/pspec.xml b/pspec.xml
deleted file mode 100644
--- a/pspec.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "https://solus-project.com/standard/pisi-spec.dtd">
-<PISI>
- <Source>
- <Name>avahi</Name>
- <Homepage>http://www.avahi.org/</Homepage>
- <Packager>
- <Name>Ikey Doherty</Name>
- <Email>ikey@evolve-os.com</Email>
- </Packager>
- <Summary>mDNS service discovery</Summary>
- <Description>Avahi is a system which facilitates service discovery on a local network via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared. Compatible technology is found in Apple MacOS X (branded ​Bonjour and sometimes Zeroconf).</Description>
- <License>GPLv2+</License>
- <Archive sha1sum="1c6d234058fd7883b3a4515e99216fdc8f71b223" type="targz">https://github.com/lathiat/avahi/releases/download/v0.6.32/avahi-0.6.32.tar.gz</Archive>
-
- <BuildDependencies>
- <Dependency type="pkgconfig" versionFrom="2.4.0">glib-2.0</Dependency>
- <Dependency type="pkgconfig" versionFrom="0.34">dbus-1</Dependency>
- <Dependency type="pkgconfig" versionFrom="0.14">libdaemon</Dependency>
- </BuildDependencies>
-
- <Patches>
- <Patch level="1">dede2a12d0bcc6ae9daf2a4671f0d618eeb44425.patch</Patch>
- </Patches>
- </Source>
-
- <Package>
- <Name>avahi</Name>
- <Files>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="executable">/usr/sbin</Path>
- <Path fileType="config">/etc/dbus-1/system.d/avahi-dbus.conf</Path>
- <Path fileType="data">/usr/share/dbus-1</Path>
- <Path fileType="data">/usr/share/avahi</Path>
- <Path fileType="data">/usr/lib/systemd</Path>
- <Path fileType="doc">/usr/share/doc</Path>
- <Path fileType="man">/usr/share/man</Path>
- <Path fileType="config">/etc/avahi</Path>
- <Path fileType="localedata">/usr/share/locale</Path>
- <Path fileType="library">/usr/lib/avahi</Path>
- <Path fileType="library">/usr/lib/lib*.so.*</Path>
- <Path fileType="library">/usr/share/gir-1.0</Path>
- <Path fileType="library">/usr/lib/girepository-1.0</Path>
- </Files>
- <Provides>
- <COMAR script="package.py">System.Package</COMAR>
- </Provides>
- </Package>
-
- <Package>
- <Name>avahi-devel</Name>
- <Summary>Development files for avahi</Summary>
- <Description>Development files for avahi</Description>
- <Files>
- <Path fileType="header">/usr/include</Path>
- <Path fileType="library">/usr/lib/lib*.so</Path>
- <Path fileType="data">/usr/lib/pkgconfig</Path>
- </Files>
- <RuntimeDependencies>
- <Dependency release="current">avahi</Dependency>
- </RuntimeDependencies>
- </Package>
-
- <History>
- <Update release="7">
- <Date>08-05-2016</Date>
- <Version>0.6.32</Version>
- <Comment>Update to 0.6.32</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="6">
- <Date>03-08-2016</Date>
- <Version>0.6.31</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="5">
- <Date>03-05-2016</Date>
- <Version>0.6.31</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="4">
- <Date>12-15-2015</Date>
- <Version>0.6.31</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="3">
- <Date>07-28-2015</Date>
- <Version>0.6.31</Version>
- <Comment>Package bump</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@solus-project.com</Email>
- </Update>
-
- <Update release="2">
- <Date>02-11-2015</Date>
- <Version>0.6.31</Version>
- <Comment>Add dns_sd.h symlink</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@evolve-os.com</Email>
- </Update>
-
- <Update release="1">
- <Date>02-11-2015</Date>
- <Version>0.6.31</Version>
- <Comment>Add avahi to repositories</Comment>
- <Name>Ikey Doherty</Name>
- <Email>ikey@evolve-os.com</Email>
- </Update>
- </History>
-</PISI>
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,96 @@
+<PISI>
+ <Source>
+ <Name>avahi</Name>
+ <Packager>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
+ </Packager>
+ <License>LGPL-2.1</License>
+ <PartOf>desktop.core</PartOf>
+ <Summary xml:lang="en">mDNS/DNS-SD service discovery</Summary>
+ <Description xml:lang="en">Avahi is a system which facilitates service discovery on a local network
+via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop
+or computer into a network and instantly be able to view other people who
+you can chat with, find printers to print to or find files being shared.
+Compatible technology is found in Apple MacOS X (branded ​Bonjour and
+sometimes Zeroconf).
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>avahi</Name>
+ <Summary xml:lang="en">mDNS/DNS-SD service discovery</Summary>
+ <Description xml:lang="en">Avahi is a system which facilitates service discovery on a local network
+via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop
+or computer into a network and instantly be able to view other people who
+you can chat with, find printers to print to or find files being shared.
+Compatible technology is found in Apple MacOS X (branded ​Bonjour and
+sometimes Zeroconf).
+</Description>
+ <PartOf>desktop.core</PartOf>
+ <Files>
+ <Path fileType="config">/etc/avahi/avahi-autoipd.action</Path>
+ <Path fileType="config">/etc/avahi/avahi-daemon.conf</Path>
+ <Path fileType="config">/etc/avahi/avahi-dnsconfd.action</Path>
+ <Path fileType="config">/etc/avahi/hosts</Path>
+ <Path fileType="config">/etc/avahi/services/sftp-ssh.service</Path>
+ <Path fileType="config">/etc/avahi/services/ssh.service</Path>
+ <Path fileType="config">/etc/dbus-1/system.d/avahi-dbus.conf</Path>
+ <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="library">/usr/lib64/avahi</Path>
+ <Path fileType="library">/usr/lib64/girepository-1.0/Avahi-0.6.typelib</Path>
+ <Path fileType="library">/usr/lib64/girepository-1.0/AvahiCore-0.6.typelib</Path>
+ <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="library">/usr/lib64/systemd/system/avahi-daemon.service</Path>
+ <Path fileType="library">/usr/lib64/systemd/system/avahi-daemon.socket</Path>
+ <Path fileType="library">/usr/lib64/systemd/system/avahi-dnsconfd.service</Path>
+ <Path fileType="library">/usr/lib64/sysusers.d/avahi.conf</Path>
+ <Path fileType="library">/usr/lib64/tmpfiles.d/avahi.conf</Path>
+ <Path fileType="executable">/usr/sbin</Path>
+ <Path fileType="data">/usr/share/avahi</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml</Path>
+ <Path fileType="data">/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service</Path>
+ <Path fileType="data">/usr/share/gir-1.0/Avahi-0.6.gir</Path>
+ <Path fileType="data">/usr/share/gir-1.0/AvahiCore-0.6.gir</Path>
+ <Path fileType="localedata">/usr/share/locale</Path>
+ <Path fileType="man">/usr/share/man</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>avahi-devel</Name>
+ <Summary xml:lang="en">Development files for avahi</Summary>
+ <Description xml:lang="en">Avahi is a system which facilitates service discovery on a local network
+via the mDNS/DNS-SD protocol suite. This enables you to plug your laptop
+or computer into a network and instantly be able to view other people who
+you can chat with, find printers to print to or find files being shared.
+Compatible technology is found in Apple MacOS X (branded ​Bonjour and
+sometimes Zeroconf).
+</Description>
+ <PartOf>programming.devel</PartOf>
+ <RuntimeDependencies>
+ <Dependency release="8">avahi</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="header">/usr/include/</Path>
+ <Path fileType="library">/usr/lib64/lib*.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="8">
+ <Date>2017-07-13</Date>
+ <Version>0.7</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Apr 30 2023, 11:41 PM (14 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5804117
Default Alt Text
D595.id1283.diff (15 KB)

Event Timeline