[girl] Prepare 9.9.0
- From: ole <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] Prepare 9.9.0
- Date: Wed, 15 Mar 2017 19:32:23 +0000 (UTC)
commit bb728da5001116bf4e8dfec1a93e14ff35787e3c
Author: Ole Aamot <oka oka no>
Date: Wed Mar 15 20:31:36 2017 +0100
Prepare 9.9.0
configure | 22 ++--------------------
girl.spec.in | 12 +++++++-----
src/Makefile.in | 1 -
src/girl-9.9.dtd | 23 +++++++++++++++++++++++
4 files changed, 32 insertions(+), 26 deletions(-)
---
diff --git a/configure b/configure
index 8f42a9e..2f62a5c 100755
--- a/configure
+++ b/configure
@@ -775,7 +775,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -864,7 +863,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1117,15 +1115,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1263,7 +1252,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1416,7 +1405,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -6672,13 +6660,7 @@ install-help: $(_HELP_LC_FILES)
elif test "x$$lc" != "xC"; then \
if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
- dname="$$f"; \
- pars="../"; \
- while test "$$dname" != "." -a "$$dname" != "/"; do \
- pars="../$$pars"; \
- dname=$$(dirname "$$dname"); \
- done; \
- $(LN_S) -f $$pars"C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+ $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
fi; \
fi; \
done; \
diff --git a/girl.spec.in b/girl.spec.in
index 959eb40..10fe070 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -7,11 +7,10 @@ URL: http://people.gnome.org/~ole/girl
Group: Applications/Internet
Source: http://people.gnome.org/~ole/%{name}/%{name}-%{version}.tar.xz
-BuildRequires: gtk2-devel
-BuildRequires: libgnome-devel
+BuildRequires: gtk3-devel
+BuildRequires: pango
+BuildRequires: libchamplain-gtk
BuildRequires: libxml2-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: libgnomeui-devel
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: libappstream-glib
@@ -35,7 +34,7 @@ Enjoy Internet Radio.
%setup -q
%build
-%configure --with-recording --disable-silent-rules
+%configure --disable-silent-rules
%install
%make_install
@@ -71,6 +70,9 @@ fi
%{_datadir}/help/*/%{name}
%changelog
+* Wed Mar 15 2017 Ole Aamot - 9.9.0-1.fc25
+- GIRL 9.9.0 build on Fedora Linux 25
+
* Sun Feb 05 2017 Ole Aamot - 9.8.0-1.fc25
- Girl 9.8.0 build on Fedora Linux 25
diff --git a/src/Makefile.in b/src/Makefile.in
index 5098c5e..f31fd54 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -351,7 +351,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/src/girl-9.9.dtd b/src/girl-9.9.dtd
new file mode 100644
index 0000000..b279836
--- /dev/null
+++ b/src/girl-9.9.dtd
@@ -0,0 +1,23 @@
+<!ATTLIST frequency uri CDATA #REQUIRED >
+<!ELEMENT description ( #PCDATA ) >
+<!ATTLIST description lang CDATA #REQUIRED >
+<!ELEMENT frequency ( #PCDATA ) >
+<!ELEMENT email ( #PCDATA ) >
+<!ELEMENT location ( lat | lon | href)* >
+<!ELEMENT girl ( station+ ) >
+<!ATTLIST girl version NMTOKEN #REQUIRED >
+<!ELEMENT station ( frequency | location | description | stream)* >
+<!ATTLIST station band CDATA #REQUIRED >
+<!ATTLIST station icon CDATA #REQUIRED >
+<!ATTLIST station id NMTOKEN #REQUIRED >
+<!ATTLIST station lang CDATA #REQUIRED >
+<!ATTLIST station name CDATA #REQUIRED >
+<!ATTLIST station rank CDATA #REQUIRED >
+<!ATTLIST station type CDATA #REQUIRED >
+<!ELEMENT stream EMPTY >
+<!ATTLIST stream bitrate NMTOKEN #REQUIRED >
+<!ATTLIST stream channels NMTOKEN #IMPLIED >
+<!ATTLIST stream codec CDATA #REQUIRED >
+<!ATTLIST stream mime CDATA #REQUIRED >
+<!ATTLIST stream samplerate NMTOKEN #REQUIRED >
+<!ATTLIST stream uri CDATA #REQUIRED >
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]