Hello community,
here is the log from the commit of package rpmlint-mini
checked in at Wed Jun 6 18:17:49 CEST 2007.
--------
--- rpmlint-mini/rpmlint-mini.changes 2007-06-05 01:14:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpmlint-mini/rpmlint-mini.changes 2007-06-06 17:15:10.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 6 17:14:53 CEST 2007 - dmueller@suse.de
+
+- add static copy of desktop-file-validate to fix
+ the rpmlint check for desktop files
+
+-------------------------------------------------------------------
New:
----
desktop-file-utils-0.12.tar.bz2
static-desktop-file-validate.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint-mini.spec ++++++
--- /var/tmp/diff_new_pack.oG3353/_old 2007-06-06 18:17:16.000000000 +0200
+++ /var/tmp/diff_new_pack.oG3353/_new 2007-06-06 18:17:16.000000000 +0200
@@ -11,14 +11,16 @@
# norootforbuild
Name: rpmlint-mini
-BuildRequires: rpm-python rpmlint
+BuildRequires: glib2-devel pkg-config rpm-python rpmlint
Summary: Rpm correctness checker
Version: 1.0
-Release: 11
+Release: 13
URL: http://rpmlint.zarb.org/
License: GNU General Public License (GPL)
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source: desktop-file-utils-0.12.tar.bz2
+Patch10: static-desktop-file-validate.diff
Source100: rpmlint-deps.txt
Source101: rpmlint.wrapper
Patch1: package-rpmlintrc.diff
@@ -35,8 +37,15 @@
Gwenole Beauchesne
%prep
+%setup -q -n desktop-file-utils-0.12
+%patch10
%build
+autoreconf -fi
+%configure
+pushd src
+make desktop-file-validate
+popd
%install
# test if the rpmlint works at all
@@ -44,6 +53,7 @@
/usr/bin/rpmlint /.rpm-cache/$BUILD_BASENAME/m4.rpm || exit 1
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/opt/testing/share/rpmlint
+install -m 755 -D src/desktop-file-validate $RPM_BUILD_ROOT/opt/testing/bin/desktop-file-validate
cp -a /usr/share/rpmlint/*.py $RPM_BUILD_ROOT/opt/testing/share/rpmlint
cd %{py_libdir}
for f in $(<%{SOURCE100}); do
@@ -86,6 +96,9 @@
/opt/testing
%changelog
+* Wed Jun 06 2007 - dmueller@suse.de
+- add static copy of desktop-file-validate to fix
+ the rpmlint check for desktop files
* Tue Jun 05 2007 - dmueller@suse.de
- remove source files to reduce size
- read $RPM_SOURCE_DIR/%%{name}-%%{version}-rpmlintrc as well
++++++ package-rpmlintrc.diff ++++++
--- /var/tmp/diff_new_pack.oG3353/_old 2007-06-06 18:17:16.000000000 +0200
+++ /var/tmp/diff_new_pack.oG3353/_new 2007-06-06 18:17:16.000000000 +0200
@@ -54,3 +54,14 @@
if not extract_dir:
extract_dir=Config.getOption('ExtractDir', '/tmp')
+--- MenuXDGCheck.py
++++ MenuXDGCheck.py
+@@ -20,7 +20,7 @@
+
+ def check_file(self, pkg, filename):
+ f = pkg.dirName() + filename
+- if getstatusoutput(('desktop-file-validate', f), 1)[0]:
++ if getstatusoutput(('/opt/testing/bin/desktop-file-validate', f), 1)[0]:
+ printError(pkg, 'invalid-desktopfile', filename)
+ if not is_utf8(f):
+ printError(pkg, 'non-utf8-desktopfile', filename)
++++++ static-desktop-file-validate.diff ++++++
--- src/Makefile.am
+++ src/Makefile.am
@@ -26,6 +26,7 @@ desktop_file_install_SOURCES= \
update_desktop_database_SOURCES = \
update-desktop-database.c
-desktop_file_validate_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
+desktop_file_validate_LDADD = /usr/lib/libglib-2.0.a
+desktop_file_validate_LDFLAGS =
desktop_file_install_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
update_desktop_database_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org