Update init spec files

Change-Id: I22a9199bd04748324fa54355f26b9bde62910631
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
index 22a0e7a..11aaa5f 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
@@ -27,7 +27,7 @@ Source1002:     %{name}.xml.in
 Source1003:     %{name}.png
 Patch9:         Blink-Add-GCC-flag-Wno-narrowing-fix-64bits-build.patch
 Patch10:        crosswalk-do-not-look-for-gtk-dependencies-on-x11.patch
-Patch11:        crosswalk-tizen-ozonewl-xdgshell150.patch
+##Patch11:        crosswalk-tizen-ozonewl-xdgshell150.patch
 
 BuildRequires:  bison
 BuildRequires:  bzip2-devel
@@ -127,7 +127,7 @@ cp -a src/xwalk/LICENSE LICENSE.xwalk
 %patch10
 %endif
 
-%patch11
+##%patch11
 
 %build
 

diff --git a/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec b/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
index dc498ed..bd31449 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/elementary/packaging/elementary.spec
@@ -1,38 +1,49 @@
+%define dbus_unavailable 1
+
 %bcond_with wayland
 %bcond_with x
 Name:           elementary
-Version:        1.7.8
-Release:        0 
+Version:        1.9.3
+Release:        0
 License:        LGPL-2.1+
 Summary:        EFL toolkit for small touchscreens
 Url:            http://trac.enlightenment.org/e/wiki/Elementary
 Group:          Graphics/EFL
 Source0:        elementary-%{version}.tar.bz2
-Source1001:    elementary.manifest
+Source1001:     elementary.manifest
 BuildRequires:  doxygen
-BuildRequires:  gettext
+BuildRequires:  gettext-devel
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(ecore-evas)
-BuildRequires:  pkgconfig(ecore-fb)
 BuildRequires:  pkgconfig(ecore-file)
 BuildRequires:  pkgconfig(ecore-imf)
+
 %if %{with wayland}
 BuildRequires:  pkgconfig(ecore-wayland)
 %endif
+
 %if %{with x}
 BuildRequires:  pkgconfig(ecore-x)
 BuildRequires:  pkgconfig(x11)
 %endif
+
+%if !%{with x}
+%if !%{with wayland}
+BuildRequires:  pkgconfig(ecore-fb)
+%endif
+%endif
+
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(eet)
 BuildRequires:  pkgconfig(efreet)
 BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(evas)
+BuildRequires:  pkgconfig(ethumb)
 BuildRequires:  pkgconfig(emotion)
-BuildRequires:  pkgconfig(ethumb_client)
 BuildRequires:  eet-tools
 BuildRequires:  python-devel
+Recommends:     %{name}-locale = %{version}
 
 %description
 Elementary is a widget set. It is a new-style of widget set much more canvas
@@ -71,14 +82,19 @@ cp %{SOURCE1001} .
 
 %build
 
-%reconfigure --disable-static \
+%autogen --disable-static \
 %if %{with wayland}
          --enable-ecore-wayland \
 %endif
 %if !%{with x}
          --disable-ecore-x \
 %endif
-         --enable-build-examples
+%if %dbus_unavailable
+         --disable-build-examples \
+%else
+         --enable-build-examples \
+%endif
+    #eol
 
 make %{?_smp_mflags}
 
@@ -93,7 +109,7 @@ make %{?_smp_mflags}
 
 %lang_package
 
-%files 
+%files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %license COPYING
@@ -105,15 +121,21 @@ make %{?_smp_mflags}
 %{_datadir}/elementary/*
 %{_datadir}/icons/elementary.png
 
+%if ! %dbus_unavailable
 %files examples
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/elementary/examples/*
+%endif
 
 %files tools
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_datadir}/applications/*
 %{_bindir}/elementary_config
 %{_bindir}/elementary_test*
+%{_bindir}/elementary_codegen
+%{_bindir}/elm_prefs_cc
 
 %files devel
 %manifest %{name}.manifest
@@ -121,5 +143,7 @@ make %{?_smp_mflags}
 %{_includedir}/elementary-1/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/Elementary/ElementaryConfig.cmake
+%{_libdir}/cmake/Elementary/ElementaryConfigVersion.cmake
 
 %changelog

diff --git a/proto-meta-Tizen_generic/specfile-initial/fdupes/packaging/fdupes.spec b/proto-meta-Tizen_generic/specfile-initial/fdupes/packaging/fdupes.spec
index 6ec07c0..c3d1881 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/fdupes/packaging/fdupes.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/fdupes/packaging/fdupes.spec
@@ -1,13 +1,13 @@
 Name:           fdupes
 Version:        1.40
-Release:        42.66
-License:        X11/MIT
+Release:        0
+License:        MIT
 Summary:        Identifying or deleting duplicate files
 Url:            http://premium.caribe.net/~adrian2/fdupes.html
-Group:          Productivity/Archiving/Compression
+Group:          Base/Compression
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        macros.fdupes
-Source1001:    fdupes.manifest
+Source1001:     fdupes.manifest
 
 %description
 FDUPES is a program for identifying or deleting duplicate files
@@ -21,8 +21,8 @@ cp %{SOURCE1001} .
 make
 
 %install
-install -D -m755 fdupes %{buildroot}/usr/bin/fdupes
-install -D -m644 fdupes.1 %{buildroot}/usr/share/man/man1/fdupes.1
+install -D -m755 fdupes %{buildroot}%{_bindir}/fdupes
+install -D -m644 fdupes.1 %{buildroot}%{_mandir}/man1/fdupes.1
 install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.fdupes
 
 %files
@@ -31,5 +31,4 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.fdupes
 %doc CHANGES
 %{_bindir}/fdupes
 %{_mandir}/*/*
-%{_sysconfdir}/rpm
-
+%config %{_sysconfdir}/rpm

diff --git a/proto-meta-Tizen_generic/specfile-initial/ibus/packaging/ibus.spec b/proto-meta-Tizen_generic/specfile-initial/ibus/packaging/ibus.spec
index 2b329ea..017771c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ibus/packaging/ibus.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ibus/packaging/ibus.spec
@@ -1,7 +1,6 @@
-# Build flags
 Name:       ibus
 Version:    1.5.4
-Release:    2
+Release:    0
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPL-2.0+
 Group:      System/Libraries
@@ -51,53 +50,40 @@ Requires:   dbus-devel
 %description devel
 The ibus-devel package contains the header files for IBus
 
-%package devel-docs
-Summary:    Developer documents for IBus
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   gtk-doc
-
-%description devel-docs
-The ibus-devel-docs package contains developer documentation for IBus
-
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-
-OPTIONS="--disable-static \
-         --disable-tests \
-         --disable-gtk2 \
-         --disable-gtk3 \
-         --disable-xim \
-         --enable-wayland \
-         --disable-vala \
-         --disable-gtk-doc \
-         --disable-gconf \
-         --disable-setup \
-         --disable-dconf \
-         --enable-python-library \
-         --disable-ui \
-         --disable-libnotify \
-         --enable-introspection"
-
-%configure $OPTIONS
-
-# make -C po update-gmo
-make %{?_smp_mflags}
+%configure --disable-static \
+           --disable-tests \
+           --disable-gtk2 \
+           --disable-gtk3 \
+           --disable-xim \
+           --enable-wayland \
+           --disable-vala \
+           --disable-gtk-doc \
+           --disable-gconf \
+           --disable-setup \
+           --disable-dconf \
+           --enable-python-library \
+           --disable-ui \
+           --disable-libnotify \
+           --enable-introspection
+
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libibus-1.0.la
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_libdir}/libibus-1.0.la
+
+rm -fr %{buildroot}%{_datadir}/gtk-doc
 
 %find_lang %{name}10
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 # recreate icon cache
@@ -139,7 +125,6 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/bash-completion/completions/ibus.bash
 %{_datadir}/man/man1/*
 
-
 %files libs
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -153,7 +138,3 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_datadir}/gir-1.0/IBus-1.0.gir
-
-%files devel-docs
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/*

diff --git a/proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec b/proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec
index 0c8dbc6..7567a07 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libtbm/packaging/libtbm.spec
@@ -1,6 +1,6 @@
 Name:           libtbm
 Version:        1.0.6
-Release:        4
+Release:        5
 License:        MIT
 Summary:        Tizen Buffer Manager Library
 Group:          System/Libraries

diff --git a/proto-meta-Tizen_generic/specfile-initial/pam/packaging/pam.spec b/proto-meta-Tizen_generic/specfile-initial/pam/packaging/pam.spec
index 96aa0e1..2b5507d 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/pam/packaging/pam.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/pam/packaging/pam.spec
@@ -5,9 +5,9 @@
 
 Name:           pam
 Version:        1.1.6
-Release:        1
+Release:        0
 License:        GPL-2.0+ or BSD-3-Clause
-Summary:        PAM
+Summary:        A Security Tool that Provides Authentication for Applications
 Url:            http://www.linux-pam.org/
 Group:          Security/Access Control
 Source0:        Linux-PAM-%{version}.tar.bz2
@@ -38,7 +38,7 @@ having to recompile programs that handle authentication.
 %package -n pam-modules-extra
 Summary:        Extra modules provided by PAM not used in the base system
 Group:          Security/Access Control
-Requires:       pam = %{version}
+Requires:       %{name} = %{version}
 
 %description -n pam-modules-extra
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -49,7 +49,7 @@ default Tizen install.
 
 %package devel
 Summary:        Files needed for developing PAM-aware applications and modules for PAM
-Requires:       pam = %{version}
+Requires:       %{name} = %{version}
 
 %description devel
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -62,10 +62,8 @@ PAM-aware applications and modules for use with PAM.
 %setup -q -n Linux-PAM-%{version}
 cp %{SOURCE1001} .
 
-
 %build
 CFLAGS="-fPIC %{optflags} " ; export CFLAGS
-
 %reconfigure \
         --libdir=%{_libdir} \
         --includedir=%{_includedir}/security \
@@ -73,9 +71,8 @@ CFLAGS="-fPIC %{optflags} " ; export CFLAGS
         --disable-audit \
         --with-db-uniquename=_pam \
         --with-libiconv-prefix=/usr \
-        --enable-read-both-confs &&
-
-make %{?_smp_flags} CFLAGS="$CFLAGS -lfl -lcrypt"
+        --enable-read-both-confs 
+%__make %{?_smp_flags} CFLAGS="$CFLAGS -lfl -lcrypt"
 
 %install
 %make_install
@@ -118,11 +115,10 @@ fi
 %attr(4755,root,root) %{_sbindir}/unix_chkpwd
 %attr(0700,root,root) %{_sbindir}/unix_update
 %attr(0755,root,root) %{_sbindir}/mkhomedir_helper
-%{_sysconfdir}/security/limits.conf
+%config %{_sysconfdir}/security/limits.conf
 %{_libdir}/libpam.so.*
 %{_libdir}/libpam_misc.so.*
 %{_libdir}/libpamc.so.*
-%dir %{_moduledir}
 %{_moduledir}/pam_deny.so
 %{_moduledir}/pam_env.so
 %{_moduledir}/pam_keyinit.so
@@ -144,13 +140,12 @@ fi
 %config(noreplace) %{_secconfdir}/access.conf
 %config(noreplace) %{_secconfdir}/group.conf
 %config(noreplace) %{_secconfdir}/namespace.conf
-#%dir %{_secconfdir}/namespace.d
 %attr(755,root,root) %config(noreplace) %{_secconfdir}/namespace.init
 %config(noreplace) %{_secconfdir}/pam_env.conf
 %config(noreplace) %{_secconfdir}/time.conf
 %dir %{_pamconfdir}
-%{_pamconfdir}/system-auth
-%{_pamconfdir}/other
+%config %{_pamconfdir}/system-auth
+%config %{_pamconfdir}/other
 
 %files -n pam-modules-extra
 %manifest %{name}.manifest

diff --git a/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec b/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
index 07fdb8c..1868d12 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/rpm/packaging/rpm.spec
@@ -38,16 +38,16 @@ BuildRequires:  fdupes
 Provides:       rpminst
 Provides:       rpm-libs
 
-Source1:       db-4.8.30.tar.bz2
-Source2:       db-4.8.30-integration.dif
-Source4:       rpm-tizen_macros
-Source8:       rpmconfigcheck
-Source13:      find-docs.sh
-Source22:      device-sec-policy
-Source23:      find-provides.ksyms
-Source1001:    rpm.manifest
+Source1:        db-4.8.30.tar.bz2
+Source2:        db-4.8.30-integration.dif
+Source4:        rpm-tizen_macros
+Source8:        rpmconfigcheck
+Source13:       find-docs.sh
+Source22:       device-sec-policy
+Source23:       find-provides.ksyms
+Source1001:     rpm.manifest
 Source0:        rpm-%{version}.tar.bz2
-#
+
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio
 
@@ -118,7 +118,7 @@ that will manipulate RPM packages and databases.
 cp %{SOURCE1001} .
 rm -rf sqlite
 tar xjf %{S:1}
-ln -s db-4.8.30 db
+ln -sfn db-4.8.30 db
 chmod -R u+w db/*
 # will get linked from db3
 rm -f rpmdb/db.h

diff --git a/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec b/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
index a0f15f1..07388e7 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
@@ -1,13 +1,12 @@
 Name:       security-server
 Summary:    Security server and utilities
-Version:    0.0.119
+Version:    0.0.120
 Release:    1
 Group:      Security/Service
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    security-server.manifest
 Source2:    libsecurity-server-client.manifest
-Source3:    libsecurity-manager-client.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
@@ -30,7 +29,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description -n libsecurity-server-client
-Tizen Security server client library
+Tizen Security server client libraries
 
 %package -n libsecurity-server-client-devel
 Summary:    Security server (client-devel)
@@ -41,24 +40,6 @@ Requires:   libprivilege-control-devel
 %description -n libsecurity-server-client-devel
 Development files needed for using the security client
 
-%package -n libsecurity-manager-client
-Summary:    Security manager (client)
-Group:      Security/Libraries
-Requires:   security-server = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libsecurity-manager-client
-Tizen Security manager client library
-
-%package -n libsecurity-manager-client-devel
-Summary:    Security manager (client-devel)
-Group:      Security/Development
-Requires:   libsecurity-manager-client = %{version}-%{release}
-
-%description -n libsecurity-manager-client-devel
-Development files needed for using the security manager client
-
 %package -n security-server-devel
 Summary:    for web applications (Development)
 Group:      Security/Development
@@ -79,7 +60,6 @@ Certificates for the Tizen Web-Runtime
 %setup -q
 cp %{SOURCE1} .
 cp %{SOURCE2} .
-cp %{SOURCE3} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -100,7 +80,6 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 cp LICENSE %{buildroot}/usr/share/license/libsecurity-server-client
-cp LICENSE %{buildroot}/usr/share/license/libsecurity-manager-client
 mkdir -p %{buildroot}/etc/security/
 cp security-server-audit.conf %{buildroot}/etc/security/
 %make_install
@@ -117,7 +96,6 @@ ln -s ../security-server-app-privilege-by-name.socket %{buildroot}/usr/lib/syste
 ln -s ../security-server-password-check.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-check.socket
 ln -s ../security-server-password-set.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-set.socket
 ln -s ../security-server-password-reset.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket
-ln -s ../security-manager-installer.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-manager-installer.socket
 
 %clean
 rm -rf %{buildroot}
@@ -148,12 +126,8 @@ fi
 
 %post -n libsecurity-server-client -p /sbin/ldconfig
 
-%post -n libsecurity-manager-client -p /sbin/ldconfig
-
 %postun -n libsecurity-server-client -p /sbin/ldconfig
 
-%postun -n libsecurity-manager-client -p /sbin/ldconfig
-
 %files -n security-server
 %manifest security-server.manifest
 %defattr(-,root,root,-)
@@ -181,8 +155,6 @@ fi
 %attr(-,root,root) /usr/lib/systemd/system/security-server-password-set.socket
 %attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket
 %attr(-,root,root) /usr/lib/systemd/system/security-server-password-reset.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-manager-installer.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-manager-installer.socket
 
 %{_datadir}/license/%{name}
 
@@ -197,19 +169,5 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libsecurity-server-client.so
 %{_libdir}/libsecurity-server-commons.so
-%{_includedir}/security-server/security-server.h
-%{_libdir}/pkgconfig/security-server.pc
-
-%files -n libsecurity-manager-client
-%manifest libsecurity-manager-client.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libsecurity-manager-client.so.*
-%{_datadir}/license/libsecurity-manager-client
-
-%files -n libsecurity-manager-client-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libsecurity-manager-client.so
-%{_libdir}/libsecurity-server-commons.so
-%{_includedir}/security-manager/security-manager.h
-%{_libdir}/pkgconfig/security-manager.pc
+/usr/include/security-server/security-server.h
+%{_libdir}/pkgconfig/*.pc

diff --git a/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec
index e54c378..861edc6 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/tizen-extensions-crosswalk/packaging/tizen-extensions-crosswalk.spec
@@ -8,7 +8,7 @@
 %define _audiosystem_demo_package tizen-extensions-crosswalk-audiosystem-demo
 
 Name:       tizen-extensions-crosswalk
-Version:    0.75
+Version:    0.79
 Release:    0
 License:    BSD-3-Clause and Apache-2.0
 Group:      Development/Libraries