Prechádzať zdrojové kódy

2014-11-16 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* gtk2, sgml-common: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9094 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 10 rokov pred
rodič
commit
6f11f70854
2 zmenil súbory, kde vykonal 66 pridanie a 39 odobranie
  1. 15 5
      g/gtk2/gtk2-vl.spec
  2. 51 34
      s/sgml-common/sgml-common-vl.spec

+ 15 - 5
g/gtk2/gtk2-vl.spec

@@ -12,7 +12,7 @@
 %define gdkpixbuf2_version %{gdkpixbuf2_base_version}-1
 %define gobject_introspection_version 0.9.8
 
-%define base_version 2.24.24
+%define base_version 2.24.25
 %define bin_version 2.10.0
 
 # biarch support
@@ -27,7 +27,7 @@ Summary(ja): X 用 GUI 作成ライブラリ: GIMP ツールキット(GTK+)
 Name: gtk2
 Version: %{base_version}
 Release: 1%{?_dist_release}
-License: LGPL
+License: LGPLv2+
 Group: System Environment/Libraries
 
 Source: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
@@ -35,7 +35,6 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
 # biarch support
 Patch1: gtk2-2.24.21-lib64.patch
 
-
 Patch100: gtk+-2.24.8-vine-default-theme.patch
 
 BuildRequires: atk-devel >= %{atk_version}
@@ -185,8 +184,16 @@ fi
  --with-included-loaders=png \
  --enable-introspection=yes
 
-make ARCH=%{_arch}
-#make
+# fight unused direct deps
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+make %{?_smp_mflags} ARCH=%{_arch}
+
+# truncate NEWS
+awk '/^Overview of Changes/ { seen+=1 }
+{ if (seen < 2) print }
+{ if (seen == 2) { print "For older news, see http://git.gnome.org/cgit/gtk+/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -325,6 +332,9 @@ fi
 %endif
 
 %changelog
+* Sun Nov 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.24.25-1
+- new upstream release
+
 * Sat Jun 28 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.24.24-1
 - new upstream release
 

+ 51 - 34
s/sgml-common/sgml-common-vl.spec

@@ -1,31 +1,34 @@
+%global xmlxsdver 2009/01
+
 Summary:	Common SGML catalog and DTD files.
+Summary(ja):	共用 SGML カタログ及び DTD ファイル集
 Name:		sgml-common
 Version:	0.6.3
-Release:	35%{?_dist_release}
-Group:		Applications/Text
+Release:	41%{?_dist_release}
 
 License:	GPL+
-URL:		http://www.iso.ch/cate/3524030.html
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libxml2 >= 2.4.8
-BuildRequires:	automake14
-Requires:	/bin/basename
+Group:		Applications/Text
+#Actually - there is no homepage of this project, on that URL
+#page you could get complete ISO 8879 listing as was on the
+#old page - only part of it is included in sgml-common package.
+URL: http://www.w3.org/2003/entities/
 
 Source0: ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/%{name}-%{version}.tgz
-#Source1: sgml-common-CHANGES
-#Source2: sgml-common-automake.tar.gz
 # From openjade:
 Source1: xml.dcl
 Source2: xml.soc
 Source3: html.dcl
 Source4: html.soc
+Source5: http://www.w3.org/%{xmlxsdver}/xml.xsd
 Patch0: sgml-common-umask.patch
 Patch1: sgml-common-xmldir.patch
 Patch2: sgml-common-quotes.patch
-Patch3: sgml-common-automake.patch
-Patch4: sgml-common-0.6.3-docdir.patch
+
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	libxml2 >= 2.4.8
+BuildRequires:	automake
+Requires:	/bin/basename
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -37,9 +40,11 @@ included in multiple packages.  Sgml-common also includes an
 up-to-date Open Catalog file.
 
 %package -n xml-common
-Group: Applications/Text
 Summary: Common XML catalog and DTD files.
+Summary(ja): 共用 XML カタログ及び DTD ファイル集
 License: GPL+
+Group: Applications/Text
+Requires(pre): %{_bindir}/xmlcatalog
 
 %description -n xml-common
 The xml-common package contains a collection of entities and DTDs
@@ -52,18 +57,11 @@ included in multiple packages.
 %patch1 -p1 -b .xmldir
 %patch2 -p1 -b .quotes
 
-#rm install-sh missing mkinstalldirs
-#tar zxf %{SOURCE2}
-#%patch3 -p1 -b .automake
-#%patch4 -p1 -b .docdir
-#touch configure
-#find -name '*.in' | xargs touch
-#touch aclocal.m4
-
 # replace bogus links with files
+automakedir=`ls -1d /usr/share/automake* | head -n +1`
 for file in COPYING INSTALL install-sh missing mkinstalldirs; do
    rm $file
-   cp -p /usr/share/automake-1.4/$file .
+   cp -p $automakedir/$file .
 done
 
 %build
@@ -82,6 +80,15 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/catalog
 # Create an empty XML catalog.
 XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
 %{_bindir}/xmlcatalog --noout --create $XMLCATALOG
+# ...and add xml.xsd in it
+for type in system uri ; do
+	for path in 2001 %{xmlxsdver} ; do
+		%{_bindir}/xmlcatalog --noout --add $type \
+			"http://www.w3.org/$path/xml.xsd" \
+			"file://%{_datadir}/xml/xml.xsd" $XMLCATALOG
+	done
+done
+
 # Now put the common DocBook entries in it
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"-//OASIS//ENTITIES DocBook XML" \
@@ -108,6 +115,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl
 install -p -m0644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 	$RPM_BUILD_ROOT%{_datadir}/sgml
 rm -rf $RPM_BUILD_ROOT%{_datadir}/xml/*
+install -p -m0644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xml
 
 # remove installed doc file and prepare installation with %%doc
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/*.html
@@ -118,6 +126,18 @@ cp -p doc/HTML/*.html __dist_doc/html/
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+%pre -n xml-common
+if [ $1 -gt 1 ] && [ -e %{_sysconfdir}/xml/catalog ]; then
+	for type in system uri ; do
+		for path in 2001 %{xmlxsdver} ; do
+			%{_bindir}/xmlcatalog --noout --add $type \
+				"http://www.w3.org/$path/xml.xsd" \
+				"file://%{_datadir}/xml/xml.xsd" \
+				%{_sysconfdir}/xml/catalog
+		done
+	done
+fi
+
 %files
 %defattr (-,root,root)
 %doc __dist_doc/html/ AUTHORS NEWS ChangeLog COPYING README
@@ -146,20 +166,17 @@ cp -p doc/HTML/*.html __dist_doc/html/
 %dir %{_datadir}/sgml/docbook
 %{_datadir}/sgml/docbook/xmlcatalog
 %dir %{_datadir}/xml
+%{_datadir}/xml/xml.xsd
 
-#post
-#if [ -f %{_libdir}/sgml/CATALOG ]; then
-#        rm %{_libdir}/sgml/CATALOG
-#fi
-#
-#{_bindir}/install-catalog --add %{_sysconfdir}/sgml/sgml-iso-entities-8879.1986 %{_datadir}/sgml/sgml-iso-entities-8879.1986/catalog >/dev/null
-
-#preun
-#if [ "$1" = "0" ]; then
-#	%{_bindir}/install-catalog --remove %{_sysconfdir}/sgml/sgml-iso-entities-8879.1986 %{_datadir}/sgml/sgml-iso-entities-8879.1986/catalog >/dev/null
-#fi
 
 %changelog
+* Sun Nov 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.6.3-41
+- updated based on Fedora 0.6.3-41
+  * Thu Oct 11 2012 Ondrej Vasik <ovasik@redhat.com> 0.6.3-38
+  - get rid of the explicit automake14 requirement
+  * Sun Oct 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.6.3-35
+  - Include xml.xsd in xml-common (#750073).
+  
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6.3-35
 - rebuild with VineSeed environment